aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-01 18:11:25 +0300
committerEli Zaretskii2014-09-01 18:11:25 +0300
commit203fb3639ace0e05284d9be5aa5c3d63701f33a4 (patch)
tree91046ede43660f1ac9338e352542cb220ac7728d
parent4ef0411746dde0e18a7a4d11e4fd1c2abdba2b9f (diff)
downloademacs-203fb3639ace0e05284d9be5aa5c3d63701f33a4.tar.gz
emacs-203fb3639ace0e05284d9be5aa5c3d63701f33a4.zip
nt/gnulib.mk: Synchronize with lib/gnulib.mk.
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/gnulib.mk57
2 files changed, 49 insertions, 12 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3eb3ea1b34e..4317a173a6a 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12014-09-01 Eli Zaretskii <eliz@gnu.org>
2
3 * gnulib.mk: Synchronize with lib/gnulib.mk.
4
12014-06-15 Glenn Morris <rgm@gnu.org> 52014-06-15 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (LDFLAGS): Explicitly set via configure. 7 * Makefile.in (LDFLAGS): Explicitly set via configure.
diff --git a/nt/gnulib.mk b/nt/gnulib.mk
index 7c2cceb959f..4a06da5fea0 100644
--- a/nt/gnulib.mk
+++ b/nt/gnulib.mk
@@ -43,7 +43,7 @@
43# the same distribution terms as the rest of that program. 43# the same distribution terms as the rest of that program.
44# 44#
45# Generated by gnulib-tool. 45# Generated by gnulib-tool.
46# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings 46# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv update-copyright utimens vla warnings
47 47
48 48
49MOSTLYCLEANFILES += core *.stackdump 49MOSTLYCLEANFILES += core *.stackdump
@@ -55,6 +55,15 @@ libgnu_a_LIBADD = $(gl_LIBOBJS)
55libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) 55libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
56EXTRA_libgnu_a_SOURCES = 56EXTRA_libgnu_a_SOURCES =
57 57
58## begin gnulib module absolute-header
59
60# Use this preprocessor expression to decide whether #include_next works.
61# Do not rely on a 'configure'-time test for this, since the expression
62# might appear in an installed header, which is used by some other compiler.
63HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
64
65## end gnulib module absolute-header
66
58## begin gnulib module alloca-opt 67## begin gnulib module alloca-opt
59 68
60BUILT_SOURCES += $(ALLOCA_H) 69BUILT_SOURCES += $(ALLOCA_H)
@@ -78,6 +87,12 @@ EXTRA_DIST += alloca.in.h
78 87
79## end gnulib module alloca-opt 88## end gnulib module alloca-opt
80 89
90## begin gnulib module binary-io
91
92libgnu_a_SOURCES += binary-io.h binary-io.c
93
94## end gnulib module binary-io
95
81## begin gnulib module byteswap 96## begin gnulib module byteswap
82 97
83BUILT_SOURCES += $(BYTESWAP_H) 98BUILT_SOURCES += $(BYTESWAP_H)
@@ -141,7 +156,7 @@ EXTRA_DIST += count-trailing-zeros.h
141 156
142libgnu_a_SOURCES += md5.c 157libgnu_a_SOURCES += md5.c
143 158
144EXTRA_DIST += md5.h 159EXTRA_DIST += gl_openssl.h md5.h
145 160
146## end gnulib module crypto/md5 161## end gnulib module crypto/md5
147 162
@@ -149,7 +164,7 @@ EXTRA_DIST += md5.h
149 164
150libgnu_a_SOURCES += sha1.c 165libgnu_a_SOURCES += sha1.c
151 166
152EXTRA_DIST += sha1.h 167EXTRA_DIST += gl_openssl.h sha1.h
153 168
154## end gnulib module crypto/sha1 169## end gnulib module crypto/sha1
155 170
@@ -157,7 +172,7 @@ EXTRA_DIST += sha1.h
157 172
158libgnu_a_SOURCES += sha256.c 173libgnu_a_SOURCES += sha256.c
159 174
160EXTRA_DIST += sha256.h 175EXTRA_DIST += gl_openssl.h sha256.h
161 176
162## end gnulib module crypto/sha256 177## end gnulib module crypto/sha256
163 178
@@ -165,7 +180,7 @@ EXTRA_DIST += sha256.h
165 180
166libgnu_a_SOURCES += sha512.c 181libgnu_a_SOURCES += sha512.c
167 182
168EXTRA_DIST += sha512.h 183EXTRA_DIST += gl_openssl.h sha512.h
169 184
170## end gnulib module crypto/sha512 185## end gnulib module crypto/sha512
171 186
@@ -335,6 +350,17 @@ EXTRA_libgnu_a_SOURCES += fsync.c
335 350
336## end gnulib module fsync 351## end gnulib module fsync
337 352
353## begin gnulib module getdtablesize
354
355if gl_GNULIB_ENABLED_getdtablesize
356
357endif
358EXTRA_DIST += getdtablesize.c
359
360EXTRA_libgnu_a_SOURCES += getdtablesize.c
361
362## end gnulib module getdtablesize
363
338## begin gnulib module getgroups 364## begin gnulib module getgroups
339 365
340if gl_GNULIB_ENABLED_getgroups 366if gl_GNULIB_ENABLED_getgroups
@@ -416,13 +442,6 @@ EXTRA_libgnu_a_SOURCES += group-member.c
416 442
417## end gnulib module group-member 443## end gnulib module group-member
418 444
419## begin gnulib module ignore-value
420
421
422EXTRA_DIST += ignore-value.h
423
424## end gnulib module ignore-value
425
426## begin gnulib module intprops 445## begin gnulib module intprops
427 446
428 447
@@ -854,6 +873,13 @@ EXTRA_libgnu_a_SOURCES += unsetenv.c
854 873
855## end gnulib module unsetenv 874## end gnulib module unsetenv
856 875
876## begin gnulib module update-copyright
877
878
879EXTRA_DIST += $(top_srcdir)/build-aux/update-copyright
880
881## end gnulib module update-copyright
882
857## begin gnulib module utimens 883## begin gnulib module utimens
858 884
859libgnu_a_SOURCES += utimens.c 885libgnu_a_SOURCES += utimens.c
@@ -868,6 +894,13 @@ EXTRA_DIST += verify.h
868 894
869## end gnulib module verify 895## end gnulib module verify
870 896
897## begin gnulib module vla
898
899
900EXTRA_DIST += vla.h
901
902## end gnulib module vla
903
871## begin gnulib module xalloc-oversized 904## begin gnulib module xalloc-oversized
872 905
873if gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec 906if gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec