X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_wait;h=a6395e4e471edea03fdb4068a40fbe562d5e36ab;hb=2ec3c8e506e9692c13ff7bb6fb0eba70c134da6a;hp=7907e53efae9f57239eaf5485edfdf82925a2bec;hpb=47a8dd64accd4e522331866a73bb79adc2d6ca78;p=gnulib.git

diff --git a/modules/sys_wait b/modules/sys_wait
index 7907e53ef..a6395e4e4 100644
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -6,26 +6,30 @@ lib/sys_wait.in.h
 m4/sys_wait_h.m4
 
 Depends-on:
+c++defs
 include_next
-link-warning
+warn-on-use
 
 configure.ac:
 gl_SYS_WAIT_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(SYS_WAIT_H)
+BUILT_SOURCES += sys/wait.h
 
 # We need the following in order to create <sys/wait.h> when the system
 # has one that is incomplete.
-sys/wait.h: sys_wait.in.h
-	$(AM_V_at)@MKDIR_P@ sys
+sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -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_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      -e 's|@''GNULIB_WAITPID''@|$(GNULIB_WAITPID)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/sys_wait.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -33,7 +37,7 @@ MOSTLYCLEANFILES += sys/wait.h sys/wait.h-t
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/wait.h>
+<sys/wait.h>
 
 License:
 LGPLv2+