diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-02-24 08:05:21 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-02-24 08:05:21 +0000 |
commit | e75c1ca802e8338ab6601788163bec9bb0591128 (patch) | |
tree | 0c82c700aca33a171763c921c9b5eac4d369eb01 /Build/source/libs/xpdf | |
parent | 6c7a45745172cf952ad650c99af32f22411cd454 (diff) |
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
Diffstat (limited to 'Build/source/libs/xpdf')
-rw-r--r-- | Build/source/libs/xpdf/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/xpdf/fofi/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/libs/xpdf/fofi/Makefile.in | 12 | ||||
-rw-r--r-- | Build/source/libs/xpdf/goo/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/libs/xpdf/goo/Makefile.in | 12 | ||||
-rw-r--r-- | Build/source/libs/xpdf/hdrs.am | 19 | ||||
-rw-r--r-- | Build/source/libs/xpdf/splash/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/libs/xpdf/splash/Makefile.in | 12 | ||||
-rw-r--r-- | Build/source/libs/xpdf/xpdf/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/libs/xpdf/xpdf/Makefile.in | 12 |
10 files changed, 45 insertions, 51 deletions
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 <peb@mppmu.mpg.de> + + * {fofi,goo,splash,xpdf}/Makefile.am: Use ../am/hdr_links.am. + * hdrs.am (removed): Obsolete. + 2011-08-10 Peter Breitenlohner <peb@mppmu.mpg.de> 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 <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)/$(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 <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)/$(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 <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/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 <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)/$(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 <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)/$(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 |