From 26112352a774737e1ce5580c93654a26c1e82b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 24 Oct 2022 22:25:29 +0200 Subject: New upstream version 1.1 --- lib/Makefile.gnulib | 210 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 123 insertions(+), 87 deletions(-) (limited to 'lib/Makefile.gnulib') diff --git a/lib/Makefile.gnulib b/lib/Makefile.gnulib index 12262d81..70583685 100644 --- a/lib/Makefile.gnulib +++ b/lib/Makefile.gnulib @@ -4,7 +4,7 @@ # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This file is distributed in the hope that it will be useful, @@ -399,6 +399,7 @@ MOSTLYCLEANFILES += core *.stackdump libunistring_la_SOURCES = +libunistring_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) libunistring_la_LIBADD = $(gl_LTLIBOBJS) libunistring_la_DEPENDENCIES = $(gl_LTLIBOBJS) EXTRA_libunistring_la_SOURCES = @@ -458,6 +459,37 @@ EXTRA_DIST += array-mergesort.h ## end gnulib module array-mergesort +## begin gnulib module assert-h + +BUILT_SOURCES += $(ASSERT_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_ASSERT_H +assert.h: assert.in.h verify.h $(top_builddir)/config.status + $(gl_V_at){ $(SED_HEADER_STDOUT) \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \ + < $(srcdir)/assert.in.h && \ + sed -e '/@assert.h omit start@/,/@assert.h omit end@/d' \ + -e 's|_gl_verify|_gl_static_assert|g' \ + -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \ + -e 's|_GL\(_STATIC_ASSERT_H\)|_GL\1|g' \ + < $(srcdir)/verify.h; \ + } > $@-t + $(AM_V_at)mv $@-t $@ +else +assert.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += assert.h assert.h-t + +EXTRA_DIST += assert.in.h verify.h + +## end gnulib module assert-h + ## begin gnulib module attribute @@ -546,9 +578,14 @@ float.h: $(top_builddir)/config.status endif MOSTLYCLEANFILES += float.h float.h-t -EXTRA_DIST += float.c float.in.h itold.c +if GL_COND_OBJ_FLOAT +libunistring_la_SOURCES += float.c +endif +if GL_COND_OBJ_ITOLD +libunistring_la_SOURCES += itold.c +endif -EXTRA_libunistring_la_SOURCES += float.c itold.c +EXTRA_DIST += float.in.h ## end gnulib module float @@ -561,10 +598,9 @@ EXTRA_DIST += fpucw.h ## begin gnulib module free-posix - -EXTRA_DIST += free.c - -EXTRA_libunistring_la_SOURCES += free.c +if GL_COND_OBJ_FREE +libunistring_la_SOURCES += free.c +endif ## end gnulib module free-posix @@ -588,10 +624,11 @@ EXTRA_libunistring_la_SOURCES += frexp.c frexpl.c ## begin gnulib module fseterr +if GL_COND_OBJ_FSETERR +libunistring_la_SOURCES += fseterr.c +endif -EXTRA_DIST += fseterr.c fseterr.h stdio-impl.h - -EXTRA_libunistring_la_SOURCES += fseterr.c +EXTRA_DIST += fseterr.h stdio-impl.h ## end gnulib module fseterr @@ -674,6 +711,13 @@ EXTRA_DIST += iconv.in.h ## begin gnulib module iconv_open +if GL_COND_OBJ_ICONV_OPEN +libunistring_la_SOURCES += iconv_open.c +endif +if GL_COND_OBJ_ICONV +libunistring_la_SOURCES += iconv.c iconv_close.c +endif + $(srcdir)/iconv_open-aix.h: $(srcdir)/iconv_open-aix.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t && \ mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h @@ -697,9 +741,7 @@ MOSTLYCLEANFILES += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h iconv_open-zos.h EXTRA_DIST += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h iconv_open-zos.h -EXTRA_DIST += iconv.c iconv_close.c iconv_open-aix.gperf iconv_open-hpux.gperf iconv_open-irix.gperf iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open-zos.gperf iconv_open.c - -EXTRA_libunistring_la_SOURCES += iconv.c iconv_close.c iconv_open.c +EXTRA_DIST += iconv_open-aix.gperf iconv_open-hpux.gperf iconv_open-irix.gperf iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open-zos.gperf ## end gnulib module iconv_open @@ -709,13 +751,6 @@ libunistring_la_SOURCES += idx.h ## end gnulib module idx -## begin gnulib module intprops - - -EXTRA_DIST += intprops.h - -## end gnulib module intprops - ## begin gnulib module inttypes-incomplete BUILT_SOURCES += inttypes.h @@ -786,28 +821,25 @@ EXTRA_libunistring_la_SOURCES += isnan.c isnanl.c ## begin gnulib module iswblank - -EXTRA_DIST += iswblank.c - -EXTRA_libunistring_la_SOURCES += iswblank.c +if GL_COND_OBJ_ISWBLANK +libunistring_la_SOURCES += iswblank.c +endif ## end gnulib module iswblank ## begin gnulib module iswdigit - -EXTRA_DIST += iswdigit.c - -EXTRA_libunistring_la_SOURCES += iswdigit.c +if GL_COND_OBJ_ISWDIGIT +libunistring_la_SOURCES += iswdigit.c +endif ## end gnulib module iswdigit ## begin gnulib module iswxdigit - -EXTRA_DIST += iswxdigit.c - -EXTRA_libunistring_la_SOURCES += iswxdigit.c +if GL_COND_OBJ_ISWXDIGIT +libunistring_la_SOURCES += iswxdigit.c +endif ## end gnulib module iswxdigit @@ -1269,19 +1301,21 @@ libunistring_la_SOURCES += mbiter.h mbiter.c ## begin gnulib module mbrtowc +if GL_COND_OBJ_MBRTOWC +libunistring_la_SOURCES += mbrtowc.c +endif -EXTRA_DIST += lc-charset-dispatch.c lc-charset-dispatch.h mbrtowc-impl-utf8.h mbrtowc-impl.h mbrtowc.c mbtowc-lock.c mbtowc-lock.h windows-initguard.h +EXTRA_DIST += lc-charset-dispatch.c lc-charset-dispatch.h mbrtowc-impl-utf8.h mbrtowc-impl.h mbtowc-lock.c mbtowc-lock.h windows-initguard.h -EXTRA_libunistring_la_SOURCES += lc-charset-dispatch.c mbrtowc.c mbtowc-lock.c +EXTRA_libunistring_la_SOURCES += lc-charset-dispatch.c mbtowc-lock.c ## end gnulib module mbrtowc ## begin gnulib module mbsinit - -EXTRA_DIST += mbsinit.c - -EXTRA_libunistring_la_SOURCES += mbsinit.c +if GL_COND_OBJ_MBSINIT +libunistring_la_SOURCES += mbsinit.c +endif ## end gnulib module mbsinit @@ -1293,10 +1327,11 @@ libunistring_la_SOURCES += mbsnlen.c ## begin gnulib module memchr +if GL_COND_OBJ_MEMCHR +libunistring_la_SOURCES += memchr.c +endif -EXTRA_DIST += memchr.c memchr.valgrind - -EXTRA_libunistring_la_SOURCES += memchr.c +EXTRA_DIST += memchr.valgrind ## end gnulib module memchr @@ -1345,19 +1380,21 @@ EXTRA_libunistring_la_SOURCES += relocatable.c ## begin gnulib module setlocale-null libunistring_la_SOURCES += setlocale_null.c +if GL_COND_OBJ_SETLOCALE_LOCK +libunistring_la_SOURCES += setlocale-lock.c +endif -EXTRA_DIST += setlocale-lock.c setlocale_null.h windows-initguard.h - -EXTRA_libunistring_la_SOURCES += setlocale-lock.c +EXTRA_DIST += setlocale_null.h windows-initguard.h ## end gnulib module setlocale-null ## begin gnulib module signbit +if GL_COND_OBJ_SIGNBIT3 +libunistring_la_SOURCES += signbitf.c signbitd.c signbitl.c +endif -EXTRA_DIST += float+.h signbitd.c signbitf.c signbitl.c - -EXTRA_libunistring_la_SOURCES += signbitd.c signbitf.c signbitl.c +EXTRA_DIST += float+.h ## end gnulib module signbit @@ -1415,27 +1452,26 @@ EXTRA_DIST += warn-on-use.h ## end gnulib module snippet/warn-on-use -## begin gnulib module stdbool +## begin gnulib module stdckdint -BUILT_SOURCES += $(STDBOOL_H) +BUILT_SOURCES += $(STDCKDINT_H) -# We need the following in order to create when the system -# doesn't have one that works. -if GL_GENERATE_STDBOOL_H -stdbool.h: stdbool.in.h $(top_builddir)/config.status +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_STDCKDINT_H +stdckdint.h: stdckdint.in.h $(top_builddir)/config.status $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \ - $(srcdir)/stdbool.in.h > $@-t + $(srcdir)/stdckdint.in.h > $@-t $(AM_V_at)mv $@-t $@ else -stdbool.h: $(top_builddir)/config.status +stdckdint.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += stdbool.h stdbool.h-t +MOSTLYCLEANFILES += stdckdint.h stdckdint.h-t -EXTRA_DIST += stdbool.in.h +EXTRA_DIST += intprops-internal.h stdckdint.in.h -## end gnulib module stdbool +## end gnulib module stdckdint ## begin gnulib module stddef @@ -1800,10 +1836,9 @@ EXTRA_DIST += string.in.h ## begin gnulib module strncat - -EXTRA_DIST += strncat.c - -EXTRA_libunistring_la_SOURCES += strncat.c +if GL_COND_OBJ_STRNCAT +libunistring_la_SOURCES += strncat.c +endif ## end gnulib module strncat @@ -1942,7 +1977,7 @@ EXTRA_DIST += unicase/special-casing-table.h unicase/special-casing.h: unicase/special-casing.in.h unicase/special-casing-table.h $(AM_V_GEN)$(MKDIR_P) '%reldir%/unicase' $(AM_V_at)declaration=`grep '^gl_unicase_special_lookup' $(srcdir)/unicase/special-casing-table.h | sed -e 's/register //g'` && \ - $(AM_V_at)$(SED_HEADER_STDOUT) \ + $(SED_HEADER_STDOUT) \ -e "/gl_unicase_special_lookup/s/gl_unicase_special_lookup.*/$${declaration};/" \ $(srcdir)/unicase/special-casing.in.h > $@-t $(AM_V_at)mv $@-t $@ @@ -5239,6 +5274,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ + -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ @@ -7208,13 +7244,6 @@ EXTRA_DIST += unictype/bitmap.h uniwidth/cjk.h uniwidth/width0.h uniwidth/width2 ## end gnulib module uniwidth/width -## begin gnulib module verify - - -EXTRA_DIST += verify.h - -## end gnulib module verify - ## begin gnulib module wchar BUILT_SOURCES += wchar.h @@ -7393,46 +7422,49 @@ EXTRA_DIST += wctype.in.h ## begin gnulib module wcwidth - -EXTRA_DIST += wcwidth.c - -EXTRA_libunistring_la_SOURCES += wcwidth.c +if GL_COND_OBJ_WCWIDTH +libunistring_la_SOURCES += wcwidth.c +endif ## end gnulib module wcwidth ## begin gnulib module windows-mutex +if GL_COND_OBJ_WINDOWS_MUTEX +libunistring_la_SOURCES += windows-mutex.c +endif -EXTRA_DIST += windows-initguard.h windows-mutex.c windows-mutex.h - -EXTRA_libunistring_la_SOURCES += windows-mutex.c +EXTRA_DIST += windows-initguard.h windows-mutex.h ## end gnulib module windows-mutex ## begin gnulib module windows-once +if GL_COND_OBJ_WINDOWS_ONCE +libunistring_la_SOURCES += windows-once.c +endif -EXTRA_DIST += windows-once.c windows-once.h - -EXTRA_libunistring_la_SOURCES += windows-once.c +EXTRA_DIST += windows-once.h ## end gnulib module windows-once ## begin gnulib module windows-recmutex +if GL_COND_OBJ_WINDOWS_RECMUTEX +libunistring_la_SOURCES += windows-recmutex.c +endif -EXTRA_DIST += windows-initguard.h windows-recmutex.c windows-recmutex.h - -EXTRA_libunistring_la_SOURCES += windows-recmutex.c +EXTRA_DIST += windows-initguard.h windows-recmutex.h ## end gnulib module windows-recmutex ## begin gnulib module windows-rwlock +if GL_COND_OBJ_WINDOWS_RWLOCK +libunistring_la_SOURCES += windows-rwlock.c +endif -EXTRA_DIST += windows-initguard.h windows-rwlock.c windows-rwlock.h - -EXTRA_libunistring_la_SOURCES += windows-rwlock.c +EXTRA_DIST += windows-initguard.h windows-rwlock.h ## end gnulib module windows-rwlock @@ -7457,3 +7489,7 @@ mostlyclean-local: mostlyclean-generic fi; \ done; \ : +distclean-local: distclean-gnulib-libobjs +distclean-gnulib-libobjs: + -rm -f @gl_LIBOBJDEPS@ +maintainer-clean-local: distclean-gnulib-libobjs -- cgit v1.2.3