X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=modules%2Fstring;h=e4cf6b6b556fc8f4fd8574f2fc54e4dc1b828870;hb=cbd5934b1918d73022d1d1d9904112f3d6d7f187;hp=45bdbdb034705cba1a6d98db6db3b977ac5ab21d;hpb=b4349b948ba2c352187158e241334abda6e473e9;p=pspp

diff --git a/modules/string b/modules/string
index 45bdbdb034..e4cf6b6b55 100644
--- a/modules/string
+++ b/modules/string
@@ -6,11 +6,11 @@ lib/string.in.h
 m4/string_h.m4
 
 Depends-on:
+arg-nonnull
 extensions
 include_next
-link-warning
-arg-nonnull
 stddef
+warn-on-use
 
 configure.ac:
 gl_HEADER_STRING_H
@@ -20,7 +20,7 @@ BUILT_SOURCES += string.h
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
+string.h: string.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -88,8 +88,9 @@ string.h: string.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
 	      -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
 	      -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
 	      -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)'; \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+	      < $(srcdir)/string.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += string.h string.h-t