build system: New Makefile fragment to `install' headers in the build tree.

git-svn-id: svn://tug.org/texlive/trunk@25493 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 35 insertions, 43 deletions

diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 2707fb57aef..f2a26970ca3 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* {fofi,goo,poppler}/Makefile.am: Use ../am/hdr_links.am.
+	* hdrs.am (removed): Obsolete.
+
 2012-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import poppler-0.18.4.
diff --git a/Build/source/libs/poppler/fofi/Makefile.am b/Build/source/libs/poppler/fofi/Makefile.am
index 701514ef26c..50f8cb23e36 100644
--- a/Build/source/libs/poppler/fofi/Makefile.am
+++ b/Build/source/libs/poppler/fofi/Makefile.am
@@ -1,12 +1,12 @@
 ## Proxy Makefile.am to build xpdf FoFi library for TeX Live.
 ##
-##   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
 ##   with or without modifications, as long as this notice is preserved.
 ##
-SRCDIR = $(top_srcdir)/$(POPPLER_TREE)/fofi
+hdr_links = $(top_srcdir)/$(POPPLER_TREE)/fofi/*.h
 
-include $(top_srcdir)/hdrs.am
+include $(top_srcdir)/../am/hdr_links.am
 
diff --git a/Build/source/libs/poppler/fofi/Makefile.in b/Build/source/libs/poppler/fofi/Makefile.in
index 74f717a7d85..1f001e28d5d 100644
--- a/Build/source/libs/poppler/fofi/Makefile.in
+++ b/Build/source/libs/poppler/fofi/Makefile.in
@@ -32,7 +32,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/hdrs.am
+	$(top_srcdir)/../am/hdr_links.am
 subdir = fofi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -149,11 +149,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SRCDIR = $(top_srcdir)/$(POPPLER_TREE)/fofi
+hdr_links = $(top_srcdir)/$(POPPLER_TREE)/fofi/*.h
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/hdrs.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -174,7 +174,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/hdrs.am:
+$(top_srcdir)/../am/hdr_links.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -335,9 +335,11 @@ uninstall-am:
 	pdf-am ps ps-am uninstall uninstall-am
 
 all-local:
-	@for file in $(SRCDIR)/*.h; do \
+	@for file in $(hdr_links); do \
+	  test -f $$file || continue; \
 	  inst=`echo $$file | sed -e 's/^.*\///'`; \
 	  test -f $$inst || { \
+	    rm -f $$inst; \
 	    echo "$(LN_S) $$file $$inst"; \
 	    $(LN_S) $$file $$inst; } || exit 1; \
 	done
diff --git a/Build/source/libs/poppler/goo/Makefile.am b/Build/source/libs/poppler/goo/Makefile.am
index 0c526796be7..e80b36ac609 100644
--- a/Build/source/libs/poppler/goo/Makefile.am
+++ b/Build/source/libs/poppler/goo/Makefile.am
@@ -1,12 +1,12 @@
 ## Proxy Makefile.am to build poppler Goo library for TeX Live.
 ##
-##   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
 ##   with or without modifications, as long as this notice is preserved.
 ##
-SRCDIR = $(top_srcdir)/$(POPPLER_TREE)/goo
+hdr_links = $(top_srcdir)/$(POPPLER_TREE)/goo/*.h
 
-include $(top_srcdir)/hdrs.am
+include $(top_srcdir)/../am/hdr_links.am
 
diff --git a/Build/source/libs/poppler/goo/Makefile.in b/Build/source/libs/poppler/goo/Makefile.in
index 984b7d3b578..9aa0102de46 100644
--- a/Build/source/libs/poppler/goo/Makefile.in
+++ b/Build/source/libs/poppler/goo/Makefile.in
@@ -32,7 +32,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/hdrs.am
+	$(top_srcdir)/../am/hdr_links.am
 subdir = goo
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -149,11 +149,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SRCDIR = $(top_srcdir)/$(POPPLER_TREE)/goo
+hdr_links = $(top_srcdir)/$(POPPLER_TREE)/goo/*.h
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/hdrs.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -174,7 +174,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/hdrs.am:
+$(top_srcdir)/../am/hdr_links.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -335,9 +335,11 @@ uninstall-am:
 	pdf-am ps ps-am uninstall uninstall-am
 
 all-local:
-	@for file in $(SRCDIR)/*.h; do \
+	@for file in $(hdr_links); do \
+	  test -f $$file || continue; \
 	  inst=`echo $$file | sed -e 's/^.*\///'`; \
 	  test -f $$inst || { \
+	    rm -f $$inst; \
 	    echo "$(LN_S) $$file $$inst"; \
 	    $(LN_S) $$file $$inst; } || exit 1; \
 	done
diff --git a/Build/source/libs/poppler/hdrs.am b/Build/source/libs/poppler/hdrs.am
deleted file mode 100644
index 80876177a35..00000000000
--- a/Build/source/libs/poppler/hdrs.am
+++ /dev/null
@@ -1,19 +0,0 @@
-## libs/xpdf/hdrs.am: Makefile fragment to create header symlinks.
-##
-##   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
-##
-##   This file is free software; the copyright holder
-##   gives unlimited permission to copy and/or distribute it,
-##   with or without modifications, as long as this notice is preserved.
-##
-all-local:
-	@for file in $(SRCDIR)/*.h; do \
-	  inst=`echo $$file | sed -e 's/^.*\///'`; \
-	  test -f $$inst || { \
-	    echo "$(LN_S) $$file $$inst"; \
-	    $(LN_S) $$file $$inst; } || exit 1; \
-	done
-
-distclean-local:
-	rm -f *.h
-
diff --git a/Build/source/libs/poppler/poppler/Makefile.am b/Build/source/libs/poppler/poppler/Makefile.am
index bf96eaa8a1a..bc96f37a48c 100644
--- a/Build/source/libs/poppler/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler/Makefile.am
@@ -1,12 +1,12 @@
 ## Proxy Makefile.am to build xpdf Xpdf library for TeX Live.
 ##
-##   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
 ##   with or without modifications, as long as this notice is preserved.
 ##
-SRCDIR = $(top_srcdir)/$(POPPLER_TREE)/poppler
+hdr_links = $(top_srcdir)/$(POPPLER_TREE)/poppler/*.h
 
-include $(top_srcdir)/hdrs.am
+include $(top_srcdir)/../am/hdr_links.am
 
diff --git a/Build/source/libs/poppler/poppler/Makefile.in b/Build/source/libs/poppler/poppler/Makefile.in
index e2ee66df7a9..2adbd105c98 100644
--- a/Build/source/libs/poppler/poppler/Makefile.in
+++ b/Build/source/libs/poppler/poppler/Makefile.in
@@ -32,7 +32,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/hdrs.am \
+	$(top_srcdir)/../am/hdr_links.am \
 	$(top_srcdir)/poppler-0.18.4/poppler/poppler-config.h.in
 subdir = poppler
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -149,12 +149,12 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SRCDIR = $(top_srcdir)/$(POPPLER_TREE)/poppler
+hdr_links = $(top_srcdir)/$(POPPLER_TREE)/poppler/*.h
 all: poppler-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/hdrs.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -175,7 +175,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/hdrs.am:
+$(top_srcdir)/../am/hdr_links.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -351,9 +351,11 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
 
 all-local:
-	@for file in $(SRCDIR)/*.h; do \
+	@for file in $(hdr_links); do \
+	  test -f $$file || continue; \
 	  inst=`echo $$file | sed -e 's/^.*\///'`; \
 	  test -f $$inst || { \
+	    rm -f $$inst; \
 	    echo "$(LN_S) $$file $$inst"; \
 	    $(LN_S) $$file $$inst; } || exit 1; \
 	done