gnulib: adjust to upstream _HEADERS change

1 files changed, 60 insertions, 9 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index e50f9b31ef3..0dac3d8dc90 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -26,6 +26,7 @@
 # Generated by gnulib-tool.
 # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu ignore-value mktime strftime
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -81,6 +82,29 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
 DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgincludedir)"
+HEADERS = $(nodist_pkginclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -477,10 +501,13 @@ EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \
         getopt_int.h intprops.h mktime-internal.h mktime.c \
         stdbool.in.h stddef.in.h strftime.c strftime.h time.in.h \
         time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h
+EXTRA_HEADERS = getopt.h stdbool.h stddef.h
 MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
         c++defs.h c++defs.h-t getopt.h getopt.h-t stdbool.h \
         stdbool.h-t stddef.h stddef.h-t time.h time.h-t unistd.h \
         unistd.h-t warn-on-use.h warn-on-use.h-t
+nodist_pkginclude_HEADERS = arg-nonnull.h c++defs.h $(GETOPT_H) \
+        $(STDBOOL_H) $(STDDEF_H) time.h unistd.h warn-on-use.h
 noinst_LIBRARIES = libgnu.a
 DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src
 libgnu_a_SOURCES = dtoastr.c gettext.h ignore-value.h
@@ -561,6 +588,26 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
+install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS)
+        @$(NORMAL_INSTALL)
+        test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
+        @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+        for p in $$list; do \
+          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+          echo "$$d$$p"; \
+        done | $(am__base_list) | \
+        while read files; do \
+          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+          $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+        done
+
+uninstall-nodist_pkgincludeHEADERS:
+        @$(NORMAL_UNINSTALL)
+        @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+        test -n "$$files" || exit 0; \
+        echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
+        cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -647,8 +694,11 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LIBRARIES)
+all-am: Makefile $(LIBRARIES) $(HEADERS)
 installdirs:
+        for dir in "$(DESTDIR)$(pkgincludedir)"; do \
+          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+        done
 install: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
@@ -699,7 +749,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-nodist_pkgincludeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -745,7 +795,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-nodist_pkgincludeHEADERS
 
 .MAKE: all check install install-am install-strip
 
@@ -755,12 +805,13 @@ uninstall-am:
         html-am info info-am install install-am install-data \
         install-data-am install-dvi install-dvi-am install-exec \
         install-exec-am install-html install-html-am install-info \
-        install-info-am install-man install-pdf install-pdf-am \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \
-        uninstall uninstall-am
+        install-info-am install-man install-nodist_pkgincludeHEADERS \
+        install-pdf install-pdf-am install-ps install-ps-am \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-compile mostlyclean-generic mostlyclean-local pdf \
+        pdf-am ps ps-am tags uninstall uninstall-am \
+        uninstall-nodist_pkgincludeHEADERS
 
 # The arg-nonnull.h that gets inserted into generated .h files is the same as
 # build-aux/arg-nonnull.h, except that it has the copyright header cut off.