X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_times;h=64683d96a39ca32c83d5d6db6b12a774452cdc0e;hb=d0f97a44fdeb55f2197ed8f191de8a91e43ad827;hp=3e4ead9f04f98e8c49c51791b889817101d2bec6;hpb=f87db1aa7ec2bb87daba4a0dd09a2e733d313f81;p=gnulib.git

diff --git a/modules/sys_times b/modules/sys_times
index 3e4ead9f0..64683d96a 100644
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -6,6 +6,8 @@ lib/sys_times.in.h
 m4/sys_times_h.m4
 
 Depends-on:
+arg-nonnull
+include_next
 link-warning
 
 configure.ac:
@@ -13,16 +15,23 @@ gl_SYS_TIMES_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(SYS_TIMES_H)
+BUILT_SOURCES += sys/times.h
 
 # We need the following in order to create <sys/times.h> when the system
 # doesn't have one that works with the given compiler.
-sys/times.h: sys_times.in.h
+sys/times.h: sys_times.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''GNULIB_TIMES''@|$(GNULIB_TIMES)|g' \
+	  sed -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \
+	      -e 's|@''GNULIB_TIMES''@|$(GNULIB_TIMES)|g' \
+	      -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \
+	      -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      < $(srcdir)/sys_times.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -30,7 +39,7 @@ MOSTLYCLEANFILES += sys/times.h sys/times.h-t
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/times.h>
+<sys/times.h>
 
 License:
 LGPLv2+