X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Finttypes;h=575cb25a62311f994e197428262f4d3814dd1721;hb=32fa5a49695a1e738873537bc5db98be2d83d4a8;hp=9f0dc4e43ad0c2cd5093a1adeb67f13b9191979b;hpb=47a8dd64accd4e522331866a73bb79adc2d6ca78;p=gnulib.git

diff --git a/modules/inttypes b/modules/inttypes
index 9f0dc4e43..575cb25a6 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -7,20 +7,21 @@ m4/inttypes-pri.m4
 m4/inttypes.m4
 
 Depends-on:
+arg-nonnull
 include_next
-link-warning
 multiarch
 stdint
+warn-on-use
 
 configure.ac:
 gl_INTTYPES_H
 
 Makefile.am:
-BUILT_SOURCES += $(INTTYPES_H)
+BUILT_SOURCES += inttypes.h
 
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
-inttypes.h: inttypes.in.h
+inttypes.h: inttypes.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
@@ -44,17 +45,18 @@ inttypes.h: inttypes.in.h
 	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
 	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
 	      -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/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_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/inttypes.in.h; \
 	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += inttypes.h inttypes.h-t
 
 Include:
-#include <inttypes.h>
+<inttypes.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all