From e75c1ca802e8338ab6601788163bec9bb0591128 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 24 Feb 2012 08:05:21 +0000 Subject: 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 --- Build/source/libs/ChangeLog | 5 +++++ Build/source/libs/am/hdr_links.am | 19 ++++++++++++++++++ Build/source/libs/gd/ChangeLog | 4 ++++ Build/source/libs/gd/include/Makefile.am | 18 +++-------------- Build/source/libs/gd/include/Makefile.in | 12 ++++++----- Build/source/libs/graphite/ChangeLog | 4 ++++ .../libs/graphite/include/graphite/Makefile.am | 18 +++-------------- .../libs/graphite/include/graphite/Makefile.in | 12 ++++++----- Build/source/libs/icu/ChangeLog | 6 ++++++ Build/source/libs/icu/hdrs.am | 23 ---------------------- Build/source/libs/icu/include/Makefile.am | 8 +++++--- Build/source/libs/icu/include/Makefile.in | 15 +++++++------- Build/source/libs/icu/include/layout/Makefile.am | 8 +++++--- Build/source/libs/icu/include/layout/Makefile.in | 15 +++++++------- Build/source/libs/icu/include/unicode/Makefile.am | 9 ++++++--- Build/source/libs/icu/include/unicode/Makefile.in | 16 +++++++-------- Build/source/libs/libpng/ChangeLog | 4 ++++ Build/source/libs/libpng/include/Makefile.am | 16 +++------------ Build/source/libs/libpng/include/Makefile.in | 12 ++++++----- Build/source/libs/poppler/ChangeLog | 5 +++++ Build/source/libs/poppler/fofi/Makefile.am | 6 +++--- Build/source/libs/poppler/fofi/Makefile.in | 12 ++++++----- Build/source/libs/poppler/goo/Makefile.am | 6 +++--- Build/source/libs/poppler/goo/Makefile.in | 12 ++++++----- Build/source/libs/poppler/hdrs.am | 19 ------------------ Build/source/libs/poppler/poppler/Makefile.am | 6 +++--- Build/source/libs/poppler/poppler/Makefile.in | 12 ++++++----- Build/source/libs/teckit/ChangeLog | 4 ++++ .../source/libs/teckit/include/teckit/Makefile.am | 16 +++------------ .../source/libs/teckit/include/teckit/Makefile.in | 12 ++++++----- Build/source/libs/xpdf/ChangeLog | 5 +++++ Build/source/libs/xpdf/fofi/Makefile.am | 6 +++--- Build/source/libs/xpdf/fofi/Makefile.in | 12 ++++++----- Build/source/libs/xpdf/goo/Makefile.am | 6 +++--- Build/source/libs/xpdf/goo/Makefile.in | 12 ++++++----- Build/source/libs/xpdf/hdrs.am | 19 ------------------ Build/source/libs/xpdf/splash/Makefile.am | 6 +++--- Build/source/libs/xpdf/splash/Makefile.in | 12 ++++++----- Build/source/libs/xpdf/xpdf/Makefile.am | 6 +++--- Build/source/libs/xpdf/xpdf/Makefile.in | 12 ++++++----- Build/source/libs/zlib/ChangeLog | 4 ++++ Build/source/libs/zlib/include/Makefile.am | 18 +++-------------- Build/source/libs/zlib/include/Makefile.in | 12 ++++++----- Build/source/libs/zziplib/ChangeLog | 4 ++++ Build/source/libs/zziplib/include/zzip/Makefile.am | 16 +++------------ Build/source/libs/zziplib/include/zzip/Makefile.in | 12 ++++++----- 46 files changed, 232 insertions(+), 264 deletions(-) create mode 100644 Build/source/libs/am/hdr_links.am delete mode 100644 Build/source/libs/icu/hdrs.am delete mode 100644 Build/source/libs/poppler/hdrs.am delete mode 100644 Build/source/libs/xpdf/hdrs.am (limited to 'Build/source/libs') diff --git a/Build/source/libs/ChangeLog b/Build/source/libs/ChangeLog index d898e17ea55..e30d80d9b5a 100644 --- a/Build/source/libs/ChangeLog +++ b/Build/source/libs/ChangeLog @@ -1,3 +1,8 @@ +2012-02-24 Peter Breitenlohner + + * am/hdr_links.am: New Makefile fragment to `install' headers + in the build tree. + 2008-04-07 Peter Breitenlohner * configure.in: respect library dependencies. diff --git a/Build/source/libs/am/hdr_links.am b/Build/source/libs/am/hdr_links.am new file mode 100644 index 00000000000..b37a54f5904 --- /dev/null +++ b/Build/source/libs/am/hdr_links.am @@ -0,0 +1,19 @@ +## libs/am/hdr_links.am: Makefile fragment for header links. +## +## Copyright (C) 2012 Peter Breitenlohner +## You may freely use, modify and/or distribute this file. +## +## requires $(hdr_links), `install' headers in the build tree. +all-local: + @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 + +distclean-local: + rm -f *.h + diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 65062f5c029..7a55aeaa5ce 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,7 @@ +2012-02-24 Peter Breitenlohner + + * include/Makefile.am: Use ../am/hdr_links.am. + 2010-09-23 Peter Breitenlohner * configure.ac: Remove unused PNGLIB_* variables. diff --git a/Build/source/libs/gd/include/Makefile.am b/Build/source/libs/gd/include/Makefile.am index 3662692f58d..96940a3bd16 100644 --- a/Build/source/libs/gd/include/Makefile.am +++ b/Build/source/libs/gd/include/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install headers headers for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,7 @@ ## GD_SRC = $(top_srcdir)/$(GD_TREE) -GD_HDRS = \ +hdr_links = \ $(GD_SRC)/entities.h \ $(GD_SRC)/gd.h \ $(GD_SRC)/gd_io.h \ @@ -23,17 +23,5 @@ GD_HDRS = \ $(GD_SRC)/jisx0208.h \ $(GD_SRC)/wbmp.h -all-local: - @for file in $(GD_HDRS); do \ - test -f $$file || continue; \ - 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 - - +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/gd/include/Makefile.in b/Build/source/libs/gd/include/Makefile.in index 0d00c37a0f4..333700d301a 100644 --- a/Build/source/libs/gd/include/Makefile.in +++ b/Build/source/libs/gd/include/Makefile.in @@ -33,8 +33,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../am/hdr_links.am subdir = include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ @@ -182,7 +183,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ GD_SRC = $(top_srcdir)/$(GD_TREE) -GD_HDRS = \ +hdr_links = \ $(GD_SRC)/entities.h \ $(GD_SRC)/gd.h \ $(GD_SRC)/gd_io.h \ @@ -200,7 +201,7 @@ GD_HDRS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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*) \ @@ -221,6 +222,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)/../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -387,12 +389,12 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ uninstall uninstall-am - all-local: - @for file in $(GD_HDRS); 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/graphite/ChangeLog b/Build/source/libs/graphite/ChangeLog index 83d55ce0fa5..aeb9a0156a5 100644 --- a/Build/source/libs/graphite/ChangeLog +++ b/Build/source/libs/graphite/ChangeLog @@ -1,3 +1,7 @@ +2012-02-24 Peter Breitenlohner + + * include/graphite/Makefile.am: Use ../am/hdr_links.am. + 2009-10-18 Peter Breitenlohner Reorganize the graphite build system: diff --git a/Build/source/libs/graphite/include/graphite/Makefile.am b/Build/source/libs/graphite/include/graphite/Makefile.am index a33d152ff6a..abcfc043005 100644 --- a/Build/source/libs/graphite/include/graphite/Makefile.am +++ b/Build/source/libs/graphite/include/graphite/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install silgraphite headers for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,7 @@ ## GRAPHITE_SRC = $(top_srcdir)/$(GRAPHITE_TREE)/include/graphite -GRAPHITE_HDRS = \ +hdr_links = \ $(GRAPHITE_SRC)/FileFont.h \ $(GRAPHITE_SRC)/Font.h \ $(GRAPHITE_SRC)/GrAppData.h \ @@ -34,17 +34,5 @@ GRAPHITE_HDRS = \ $(GRAPHITE_SRC)/SegmentAux.h \ $(GRAPHITE_SRC)/SegmentPainter.h -all-local: - @for file in $(GRAPHITE_HDRS); do \ - test -f $$file || continue; \ - 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 - - +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/graphite/include/graphite/Makefile.in b/Build/source/libs/graphite/include/graphite/Makefile.in index ccb7d81a29b..11e834d52ae 100644 --- a/Build/source/libs/graphite/include/graphite/Makefile.in +++ b/Build/source/libs/graphite/include/graphite/Makefile.in @@ -33,8 +33,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../am/hdr_links.am subdir = include/graphite -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/configure.ac @@ -152,7 +153,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ GRAPHITE_SRC = $(top_srcdir)/$(GRAPHITE_TREE)/include/graphite -GRAPHITE_HDRS = \ +hdr_links = \ $(GRAPHITE_SRC)/FileFont.h \ $(GRAPHITE_SRC)/Font.h \ $(GRAPHITE_SRC)/GrAppData.h \ @@ -181,7 +182,7 @@ GRAPHITE_HDRS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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*) \ @@ -202,6 +203,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)/../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -361,12 +363,12 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - all-local: - @for file in $(GRAPHITE_HDRS); 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/icu/ChangeLog b/Build/source/libs/icu/ChangeLog index 320d1cdb1d7..c59e8216c95 100644 --- a/Build/source/libs/icu/ChangeLog +++ b/Build/source/libs/icu/ChangeLog @@ -1,3 +1,9 @@ +2012-02-24 Peter Breitenlohner + + * include/Makefile.am, include/{layout,unicode/}/Makefile.am: + Use ../am/hdr_links.am. + * hdrs.am (removed): Obsolete. + 2011-08-10 Peter Breitenlohner Adapted to the ICU 4.8.1 distribution. diff --git a/Build/source/libs/icu/hdrs.am b/Build/source/libs/icu/hdrs.am deleted file mode 100644 index 6a8260a5be1..00000000000 --- a/Build/source/libs/icu/hdrs.am +++ /dev/null @@ -1,23 +0,0 @@ -## libs/icu/hdrs.am: Makefile fragment to create header symlinks. -## -## Copyright (C) 2009 Peter Breitenlohner -## -## 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. -## -ICU_SRC = $(top_srcdir)/$(ICU_TREE) -ICU_BLD = $(top_builddir)/icu-build - -all-local: - @for file in $(ICU_HDRS); do \ - test -f $$file || continue; \ - 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/icu/include/Makefile.am b/Build/source/libs/icu/include/Makefile.am index 0718b05716a..08537fd1344 100644 --- a/Build/source/libs/icu/include/Makefile.am +++ b/Build/source/libs/icu/include/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install ICU headers for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,9 +8,11 @@ ## SUBDIRS = layout unicode +ICU_SRC = $(top_srcdir)/$(ICU_TREE) + # ICU headers to be installed in include/ -ICU_HDRS = \ +hdr_links = \ $(ICU_SRC)/common/cmemory.h -include $(top_srcdir)/hdrs.am +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/icu/include/Makefile.in b/Build/source/libs/icu/include/Makefile.in index c16556789c2..3968a750e2b 100644 --- a/Build/source/libs/icu/include/Makefile.in +++ b/Build/source/libs/icu/include/Makefile.in @@ -34,7 +34,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/hdrs.am + $(top_srcdir)/../am/hdr_links.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -174,17 +174,16 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = layout unicode +ICU_SRC = $(top_srcdir)/$(ICU_TREE) # ICU headers to be installed in include/ -ICU_HDRS = \ +hdr_links = \ $(ICU_SRC)/common/cmemory.h -ICU_SRC = $(top_srcdir)/$(ICU_TREE) -ICU_BLD = $(top_builddir)/icu-build all: all-recursive .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*) \ @@ -205,7 +204,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 @@ -527,12 +526,12 @@ uninstall-am: mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ tags-recursive uninstall uninstall-am - all-local: - @for file in $(ICU_HDRS); 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/icu/include/layout/Makefile.am b/Build/source/libs/icu/include/layout/Makefile.am index ce3feb217a4..7dfcb1f09ed 100644 --- a/Build/source/libs/icu/include/layout/Makefile.am +++ b/Build/source/libs/icu/include/layout/Makefile.am @@ -1,15 +1,17 @@ ## Proxy Makefile.am to install ICU headers for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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. ## +ICU_SRC = $(top_srcdir)/$(ICU_TREE) + # ICU headers to be installed in include/layout/ -ICU_HDRS = \ +hdr_links = \ $(ICU_SRC)/layout/*.h \ $(ICU_SRC)/layoutex/*.h -include $(top_srcdir)/hdrs.am +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/icu/include/layout/Makefile.in b/Build/source/libs/icu/include/layout/Makefile.in index e1e45098284..929d5edd09c 100644 --- a/Build/source/libs/icu/include/layout/Makefile.in +++ b/Build/source/libs/icu/include/layout/Makefile.in @@ -34,7 +34,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/hdrs.am + $(top_srcdir)/../am/hdr_links.am subdir = include/layout ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -133,18 +133,17 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +ICU_SRC = $(top_srcdir)/$(ICU_TREE) # ICU headers to be installed in include/layout/ -ICU_HDRS = \ +hdr_links = \ $(ICU_SRC)/layout/*.h \ $(ICU_SRC)/layoutex/*.h -ICU_SRC = $(top_srcdir)/$(ICU_TREE) -ICU_BLD = $(top_builddir)/icu-build 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*) \ @@ -165,7 +164,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 @@ -325,12 +324,12 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - all-local: - @for file in $(ICU_HDRS); 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/icu/include/unicode/Makefile.am b/Build/source/libs/icu/include/unicode/Makefile.am index 48d3d78df00..551cf5e211f 100644 --- a/Build/source/libs/icu/include/unicode/Makefile.am +++ b/Build/source/libs/icu/include/unicode/Makefile.am @@ -1,17 +1,20 @@ ## Proxy Makefile.am to install ICU headers for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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. ## +ICU_BLD = $(top_builddir)/icu-build +ICU_SRC = $(top_srcdir)/$(ICU_TREE) + # ICU headers to be installed in include/unicode/ -ICU_HDRS = \ +hdr_links = \ $(ICU_BLD)/common/unicode/*.h \ $(ICU_SRC)/common/unicode/*.h \ $(ICU_SRC)/i18n/unicode/*.h \ $(ICU_SRC)/io/unicode/*.h -include $(top_srcdir)/hdrs.am +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/icu/include/unicode/Makefile.in b/Build/source/libs/icu/include/unicode/Makefile.in index b7bc2f2a12d..35142e3c8bd 100644 --- a/Build/source/libs/icu/include/unicode/Makefile.in +++ b/Build/source/libs/icu/include/unicode/Makefile.in @@ -34,7 +34,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/hdrs.am + $(top_srcdir)/../am/hdr_links.am subdir = include/unicode ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -133,20 +133,20 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +ICU_BLD = $(top_builddir)/icu-build +ICU_SRC = $(top_srcdir)/$(ICU_TREE) # ICU headers to be installed in include/unicode/ -ICU_HDRS = \ +hdr_links = \ $(ICU_BLD)/common/unicode/*.h \ $(ICU_SRC)/common/unicode/*.h \ $(ICU_SRC)/i18n/unicode/*.h \ $(ICU_SRC)/io/unicode/*.h -ICU_SRC = $(top_srcdir)/$(ICU_TREE) -ICU_BLD = $(top_builddir)/icu-build 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*) \ @@ -167,7 +167,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 @@ -327,12 +327,12 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - all-local: - @for file in $(ICU_HDRS); 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/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index fa18072a509..9988ba57db6 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,7 @@ +2012-02-24 Peter Breitenlohner + + * include/Makefile.am: Use ../am/hdr_links.am. + 2012-02-23 Peter Breitenlohner Import libpng-1.5.9. diff --git a/Build/source/libs/libpng/include/Makefile.am b/Build/source/libs/libpng/include/Makefile.am index 0c361096ecc..7d799db771c 100644 --- a/Build/source/libs/libpng/include/Makefile.am +++ b/Build/source/libs/libpng/include/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install libpng headers for TeX Live. ## -## Copyright (C) 2009, 2011 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,20 +8,10 @@ ## LIBPNG_SRC = $(top_srcdir)/$(LIBPNG_TREE) -LIBPNG_HDRS = \ +hdr_links = \ $(LIBPNG_SRC)/png.h \ $(LIBPNG_SRC)/pngconf.h \ $(LIBPNG_SRC)/pnglibconf.h -all-local: - @for file in $(LIBPNG_HDRS); do \ - test -f $$file || continue; \ - 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 +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/libpng/include/Makefile.in b/Build/source/libs/libpng/include/Makefile.in index b9862c29f9e..99a31be0fb8 100644 --- a/Build/source/libs/libpng/include/Makefile.in +++ b/Build/source/libs/libpng/include/Makefile.in @@ -31,8 +31,9 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../am/hdr_links.am subdir = include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ @@ -144,7 +145,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ LIBPNG_SRC = $(top_srcdir)/$(LIBPNG_TREE) -LIBPNG_HDRS = \ +hdr_links = \ $(LIBPNG_SRC)/png.h \ $(LIBPNG_SRC)/pngconf.h \ $(LIBPNG_SRC)/pnglibconf.h @@ -152,7 +153,7 @@ LIBPNG_HDRS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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*) \ @@ -173,6 +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)/../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -332,12 +334,12 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - all-local: - @for file in $(LIBPNG_HDRS); 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/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 + + * {fofi,goo,poppler}/Makefile.am: Use ../am/hdr_links.am. + * hdrs.am (removed): Obsolete. + 2012-02-23 Peter Breitenlohner 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 +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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 +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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 -## -## 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 +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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 diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index 37f02a074ac..ca1c96ea2b1 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,7 @@ +2012-02-24 Peter Breitenlohner + + * include/teckit/Makefile.am: Use ../am/hdr_links.am. + 2011-10-04 Peter Breitenlohner * Makefile.am (DISTCLEANFILES): Add CXXLD.sh. diff --git a/Build/source/libs/teckit/include/teckit/Makefile.am b/Build/source/libs/teckit/include/teckit/Makefile.am index 7ab89da5884..072f9c4681b 100644 --- a/Build/source/libs/teckit/include/teckit/Makefile.am +++ b/Build/source/libs/teckit/include/teckit/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install TECkit headers for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,20 +8,10 @@ ## TECKIT_SRC = $(top_srcdir)/$(TECKIT_TREE)/source/Public-headers -TECKIT_HDRS = \ +hdr_links = \ $(TECKIT_SRC)/TECkit_Common.h \ $(TECKIT_SRC)/TECkit_Compiler.h \ $(TECKIT_SRC)/TECkit_Engine.h -all-local: - @for file in $(TECKIT_HDRS); do \ - test -f $$file || continue; \ - 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 +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/teckit/include/teckit/Makefile.in b/Build/source/libs/teckit/include/teckit/Makefile.in index cb8caa3ff53..259a2ec5516 100644 --- a/Build/source/libs/teckit/include/teckit/Makefile.in +++ b/Build/source/libs/teckit/include/teckit/Makefile.in @@ -33,8 +33,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../am/hdr_links.am subdir = include/teckit -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ @@ -160,7 +161,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ TECKIT_SRC = $(top_srcdir)/$(TECKIT_TREE)/source/Public-headers -TECKIT_HDRS = \ +hdr_links = \ $(TECKIT_SRC)/TECkit_Common.h \ $(TECKIT_SRC)/TECkit_Compiler.h \ $(TECKIT_SRC)/TECkit_Engine.h @@ -168,7 +169,7 @@ TECKIT_HDRS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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*) \ @@ -189,6 +190,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)/../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -348,12 +350,12 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - all-local: - @for file in $(TECKIT_HDRS); 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/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index b1d684c11c7..072a81ed973 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/ChangeLog @@ -1,3 +1,8 @@ +2012-02-24 Peter Breitenlohner + + * {fofi,goo,splash,xpdf}/Makefile.am: Use ../am/hdr_links.am. + * hdrs.am (removed): Obsolete. + 2011-08-10 Peter Breitenlohner Adapted to the xpdf 3.03 distribution. diff --git a/Build/source/libs/xpdf/fofi/Makefile.am b/Build/source/libs/xpdf/fofi/Makefile.am index 7e6fda7ef0d..ed3ad8ebd3a 100644 --- a/Build/source/libs/xpdf/fofi/Makefile.am +++ b/Build/source/libs/xpdf/fofi/Makefile.am @@ -1,12 +1,12 @@ ## Proxy Makefile.am to build xpdf FoFi library for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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)/$(XPDF_TREE)/fofi +hdr_links = $(top_srcdir)/$(XPDF_TREE)/fofi/*.h -include $(top_srcdir)/hdrs.am +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/xpdf/fofi/Makefile.in b/Build/source/libs/xpdf/fofi/Makefile.in index e08b8709c9c..a99df4851e8 100644 --- a/Build/source/libs/xpdf/fofi/Makefile.in +++ b/Build/source/libs/xpdf/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-warnings.m4 \ @@ -143,11 +143,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SRCDIR = $(top_srcdir)/$(XPDF_TREE)/fofi +hdr_links = $(top_srcdir)/$(XPDF_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*) \ @@ -168,7 +168,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 @@ -329,9 +329,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/xpdf/goo/Makefile.am b/Build/source/libs/xpdf/goo/Makefile.am index 5198727c1e5..84630d02255 100644 --- a/Build/source/libs/xpdf/goo/Makefile.am +++ b/Build/source/libs/xpdf/goo/Makefile.am @@ -1,12 +1,12 @@ ## Proxy Makefile.am to build xpdf Goo library for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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)/$(XPDF_TREE)/goo +hdr_links = $(top_srcdir)/$(XPDF_TREE)/goo/*.h -include $(top_srcdir)/hdrs.am +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/xpdf/goo/Makefile.in b/Build/source/libs/xpdf/goo/Makefile.in index ec349954aef..48a663bf609 100644 --- a/Build/source/libs/xpdf/goo/Makefile.in +++ b/Build/source/libs/xpdf/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-warnings.m4 \ @@ -143,11 +143,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SRCDIR = $(top_srcdir)/$(XPDF_TREE)/goo +hdr_links = $(top_srcdir)/$(XPDF_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*) \ @@ -168,7 +168,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 @@ -329,9 +329,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/xpdf/hdrs.am b/Build/source/libs/xpdf/hdrs.am deleted file mode 100644 index 80876177a35..00000000000 --- a/Build/source/libs/xpdf/hdrs.am +++ /dev/null @@ -1,19 +0,0 @@ -## libs/xpdf/hdrs.am: Makefile fragment to create header symlinks. -## -## Copyright (C) 2009 Peter Breitenlohner -## -## 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/xpdf/splash/Makefile.am b/Build/source/libs/xpdf/splash/Makefile.am index 26355a33ae5..4c7d5029d0b 100644 --- a/Build/source/libs/xpdf/splash/Makefile.am +++ b/Build/source/libs/xpdf/splash/Makefile.am @@ -1,12 +1,12 @@ ## Proxy Makefile.am to build xpdf Xpdf library for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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)/$(XPDF_TREE)/splash +hdr_links = $(top_srcdir)/$(XPDF_TREE)/splash/*.h -include $(top_srcdir)/hdrs.am +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/xpdf/splash/Makefile.in b/Build/source/libs/xpdf/splash/Makefile.in index c0ca4ef9507..70fd4709d9f 100644 --- a/Build/source/libs/xpdf/splash/Makefile.in +++ b/Build/source/libs/xpdf/splash/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 = splash ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \ @@ -143,11 +143,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SRCDIR = $(top_srcdir)/$(XPDF_TREE)/splash +hdr_links = $(top_srcdir)/$(XPDF_TREE)/splash/*.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*) \ @@ -168,7 +168,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 @@ -329,9 +329,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/xpdf/xpdf/Makefile.am b/Build/source/libs/xpdf/xpdf/Makefile.am index 345efa2d3ff..971273a2cd5 100644 --- a/Build/source/libs/xpdf/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/xpdf/Makefile.am @@ -1,12 +1,12 @@ ## Proxy Makefile.am to build xpdf Xpdf library for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## 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)/$(XPDF_TREE)/xpdf +hdr_links = $(top_srcdir)/$(XPDF_TREE)/xpdf/*.h -include $(top_srcdir)/hdrs.am +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/xpdf/xpdf/Makefile.in b/Build/source/libs/xpdf/xpdf/Makefile.in index ed6da950dc4..00e5a0bd96c 100644 --- a/Build/source/libs/xpdf/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/xpdf/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 = xpdf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \ @@ -143,11 +143,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SRCDIR = $(top_srcdir)/$(XPDF_TREE)/xpdf +hdr_links = $(top_srcdir)/$(XPDF_TREE)/xpdf/*.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*) \ @@ -168,7 +168,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 @@ -329,9 +329,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/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog index 161481c1ca9..5549477aa2e 100644 --- a/Build/source/libs/zlib/ChangeLog +++ b/Build/source/libs/zlib/ChangeLog @@ -1,3 +1,7 @@ +2012-02-24 Peter Breitenlohner + + * include/Makefile.am: Use ../am/hdr_links.am. + 2012-02-16 Peter Breitenlohner * ac/zlib.ac: Drop requirement for zlib-1.2.6 or later. diff --git a/Build/source/libs/zlib/include/Makefile.am b/Build/source/libs/zlib/include/Makefile.am index b79c908d434..6ee82c6187b 100644 --- a/Build/source/libs/zlib/include/Makefile.am +++ b/Build/source/libs/zlib/include/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install zlib headers for TeX Live. ## -## Copyright (C) 2009 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -9,21 +9,9 @@ ZLIB_SRC = $(top_srcdir)/$(ZLIB_TREE) ZLIB_BLD = $(top_builddir) -ZLIB_HDRS = \ +hdr_links = \ $(ZLIB_SRC)/zlib.h \ $(ZLIB_BLD)/zconf.h -all-local: - @for file in $(ZLIB_HDRS); do \ - test -f $$file || continue; \ - 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 - - +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/zlib/include/Makefile.in b/Build/source/libs/zlib/include/Makefile.in index efabec4a9b7..cf07a57aef0 100644 --- a/Build/source/libs/zlib/include/Makefile.in +++ b/Build/source/libs/zlib/include/Makefile.in @@ -31,8 +31,9 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../am/hdr_links.am subdir = include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac @@ -138,14 +139,14 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ZLIB_SRC = $(top_srcdir)/$(ZLIB_TREE) ZLIB_BLD = $(top_builddir) -ZLIB_HDRS = \ +hdr_links = \ $(ZLIB_SRC)/zlib.h \ $(ZLIB_BLD)/zconf.h all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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*) \ @@ -166,6 +167,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)/../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -325,12 +327,12 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - all-local: - @for file in $(ZLIB_HDRS); 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/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index aaa6e3f6cd7..e492ebc70c0 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,7 @@ +2012-02-24 Peter Breitenlohner + + * include/zzip/Makefile.am: Use ../am/hdr_links.am. + 2011-10-04 Peter Breitenlohner * Makefile.am (DISTCLEANFILES): Add _configs.sed. diff --git a/Build/source/libs/zziplib/include/zzip/Makefile.am b/Build/source/libs/zziplib/include/zzip/Makefile.am index a1de19ed297..6d39938f291 100644 --- a/Build/source/libs/zziplib/include/zzip/Makefile.am +++ b/Build/source/libs/zziplib/include/zzip/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install zziplib headers for TeX Live. ## -## Copyright (C) 2010 Peter Breitenlohner +## Copyright (C) 2010-2012 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,7 @@ ## ZZIPLIB_SRC = $(top_srcdir)/$(ZZIPLIB_TREE)/zzip -ZZIPLIB_HDRS = \ +hdr_links = \ $(ZZIPLIB_SRC)/autoconf.h \ $(ZZIPLIB_SRC)/conf.h \ $(ZZIPLIB_SRC)/fetch.h \ @@ -22,15 +22,5 @@ ZZIPLIB_HDRS = \ $(ZZIPLIB_SRC)/write.h \ $(ZZIPLIB_SRC)/zzip.h -all-local: - @for file in $(ZZIPLIB_HDRS); do \ - test -f $$file || continue; \ - 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 +include $(top_srcdir)/../am/hdr_links.am diff --git a/Build/source/libs/zziplib/include/zzip/Makefile.in b/Build/source/libs/zziplib/include/zzip/Makefile.in index cfa199b1338..abfefc6627e 100644 --- a/Build/source/libs/zziplib/include/zzip/Makefile.in +++ b/Build/source/libs/zziplib/include/zzip/Makefile.in @@ -33,8 +33,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../am/hdr_links.am subdir = include/zzip -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \ $(top_srcdir)/m4/ax_prefix_config_h.m4 \ @@ -156,7 +157,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ZZIPLIB_SRC = $(top_srcdir)/$(ZZIPLIB_TREE)/zzip -ZZIPLIB_HDRS = \ +hdr_links = \ $(ZZIPLIB_SRC)/autoconf.h \ $(ZZIPLIB_SRC)/conf.h \ $(ZZIPLIB_SRC)/fetch.h \ @@ -173,7 +174,7 @@ ZZIPLIB_HDRS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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*) \ @@ -194,6 +195,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)/../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -353,12 +355,12 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - all-local: - @for file in $(ZZIPLIB_HDRS); 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 -- cgit v1.2.3