1 files changed, 10 insertions, 13 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index e2dc38b..7edf495 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -44,17 +44,6 @@ EXTRA_DIST += alignof.h
 
 ## end   gnulib module alignof
 
-## begin gnulib module alloca
-
-
-EXTRA_DIST += alloca.c
-
-EXTRA_libgnu_a_SOURCES += alloca.c
-
-libgnu_a_LIBADD += @ALLOCA@
-libgnu_a_DEPENDENCIES += @ALLOCA@
-## end   gnulib module alloca
-
 ## begin gnulib module alloca-opt
 
 BUILT_SOURCES += $(ALLOCA_H)
@@ -833,11 +822,11 @@ EXTRA_libgnu_a_SOURCES += mountlist.c
 
 ## begin gnulib module netdb
 
-BUILT_SOURCES += $(NETDB_H)
+BUILT_SOURCES += netdb.h
 
 # We need the following in order to create <netdb.h> when the system
 # doesn't have one that works with the given compiler.
-netdb.h: netdb.in.h $(ARG_NONNULL_H)
+netdb.h: netdb.in.h $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -851,6 +840,7 @@ netdb.h: netdb.in.h $(ARG_NONNULL_H)
               -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \
               -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               < $(srcdir)/netdb.in.h; \
         } > $@-t && \
         mv $@-t $@
@@ -1140,6 +1130,7 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
               -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
               -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+              -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
@@ -1333,6 +1324,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
               -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
               -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
+              -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
               -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
               -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
               -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
@@ -1506,6 +1498,7 @@ time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
               -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
               -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+              -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
               -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
               -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
@@ -1577,6 +1570,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
               -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
               -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
+              -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \
               -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
               -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
               -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
@@ -1611,6 +1605,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
               -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
               -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
+              -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
               -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
               -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
               -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
@@ -1638,10 +1633,12 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
               -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
               -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
+              -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
               -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
               -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
               -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
               -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
+              -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
               -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
               -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
               -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \