X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_times;h=7a543b420d92a0b0d6d6103171686bf0231a27ee;hb=b9d1fbeaa2ac943998d21abd9b973dd8a2d62eed;hp=23af53741440d92f63e23be2ccf2063dda239607;hpb=2d4d7d9d00fe33b6f5291e00a30b6c1016775b74;p=gnulib.git

diff --git a/modules/sys_times b/modules/sys_times
index 23af53741..7a543b420 100644
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -6,25 +6,33 @@ lib/sys_times.in.h
 m4/sys_times_h.m4
 
 Depends-on:
-link-warning
 arg-nonnull
+include_next
+warn-on-use
 
 configure.ac:
 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 $(LINK_WARNING_H) $(ARG_NONNULL_H)
+sys/times.h: sys_times.in.h $(WARN_ON_USE_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' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	  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|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|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_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/sys_times.in.h; \
 	} > $@-t && \
 	mv $@-t $@