X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fglob;h=0caaeefcd79ee9bbdeacc9dc7b81fdeac1afaf79;hb=3361b6d48f06367906059ba220639436b50dbe4d;hp=bf7af7c68b53f6aeec8b2c8ee08ebf604a11414f;hpb=bd8cfad4eb68e459d9fd24144df7a106765f8c09;p=gnulib.git

diff --git a/modules/glob b/modules/glob
index bf7af7c68..0caaeefcd 100644
--- a/modules/glob
+++ b/modules/glob
@@ -10,6 +10,8 @@ m4/glob.m4
 
 Depends-on:
 alloca
+arg-nonnull
+c++defs
 d-type
 dirfd
 extensions
@@ -21,6 +23,7 @@ stdbool
 strdup
 sys_stat
 unistd
+warn-on-use
 malloc-posix
 
 configure.ac:
@@ -31,12 +34,15 @@ BUILT_SOURCES += $(GLOB_H)
 
 # We need the following in order to create <glob.h> when the system
 # doesn't have one that works with the given compiler.
-glob.h: glob.in.h
-	rm -f $@-t $@
+glob.h: glob.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|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)' \
 	      < $(srcdir)/glob.in.h; \
-	} > $@-t
+	} > $@-t && \
 	mv -f $@-t $@
 MOSTLYCLEANFILES += glob.h glob.h-t