X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fglob;h=0caaeefcd79ee9bbdeacc9dc7b81fdeac1afaf79;hb=9d3af100c7a626ed2b501fb7d0a97936f72ce9ac;hp=cc760fcf57a42a3a873da8ce013fb7c4e08d9976;hpb=1ce45f05ab59644470d7588d054fb27d96f8d980;p=gnulib.git

diff --git a/modules/glob b/modules/glob
index cc760fcf5..0caaeefcd 100644
--- a/modules/glob
+++ b/modules/glob
@@ -3,22 +3,28 @@ glob() function: Search for files and directories with paths matching a
 pattern, with GNU extensions.
 
 Files:
-lib/glob_.h
+lib/glob.in.h
 lib/glob-libc.h
 lib/glob.c
 m4/glob.m4
 
 Depends-on:
 alloca
+arg-nonnull
+c++defs
 d-type
+dirfd
 extensions
 fnmatch
 getlogin_r
+memchr
 mempcpy
 stdbool
 strdup
 sys_stat
 unistd
+warn-on-use
+malloc-posix
 
 configure.ac:
 gl_GLOB
@@ -28,11 +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_.h
+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' \
-	      < $(srcdir)/glob_.h; \
-	} > $@-t
+	      -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 && \
 	mv -f $@-t $@
 MOSTLYCLEANFILES += glob.h glob.h-t
 
@@ -40,7 +50,7 @@ Include:
 <glob.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all, glibc