diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-06 09:40:06 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-06 09:40:06 +0000 |
| commit | 832b5ce3848de5ca76c493570fc066f450ec8011 (patch) | |
| tree | 52b629b6cd51b3769658ae55dc1f511c0bcac222 | |
| parent | 7d7828afcc587d0e0889fb0a62cdfe25c53cb9d2 (diff) | |
build system: Move Makefile fragments from libs/am/ and texk/am/ to top-level/am.
git-svn-id: svn://tug.org/texlive/trunk@31117 c570f23f-e606-0410-a88d-b1316a301751
113 files changed, 488 insertions, 270 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index f43959a96c3..c999f685d8e 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,8 @@ +2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/*.am: New Makefile fragments from libs/am/ and tekk/am/. + * am/rebuild.am: New Makefile fragment to rebuild a library. + 2013-03-01 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Added Automake options 'tar-pax' for paths diff --git a/Build/source/texk/am/bin_links.am b/Build/source/am/bin_links.am index 69d01013e8a..3cb7406b603 100644 --- a/Build/source/texk/am/bin_links.am +++ b/Build/source/am/bin_links.am @@ -1,6 +1,6 @@ -## texk/am/bin_links.am: Makefile fragment for bindir links. +## am/bin_links.am: Makefile fragment for bindir links. ## -## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## requires conditional WIN32 diff --git a/Build/source/libs/am/hdr_links.am b/Build/source/am/hdr_links.am index 74b429b2c7f..4985c32ca2a 100644 --- a/Build/source/libs/am/hdr_links.am +++ b/Build/source/am/hdr_links.am @@ -1,6 +1,6 @@ -## libs/am/hdr_links.am: Makefile fragment for header links. +## am/hdr_links.am: Makefile fragment for header links. ## -## Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2012-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## requires $(hdr_links), `install' headers in the build tree. diff --git a/Build/source/texk/am/man.am b/Build/source/am/man.am index 7453c0aa7f0..61ab0d30ee0 100644 --- a/Build/source/texk/am/man.am +++ b/Build/source/am/man.am @@ -1,6 +1,6 @@ -## texk/am/man.am: Makefile fragment for kpathsea and web2c manual pages. +## am/man.am: Makefile fragment for kpathsea and web2c manual pages. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## requires $(man_sources) diff --git a/Build/source/texk/am/man1_links.am b/Build/source/am/man1_links.am index f34a3fa8e1e..d08b82591ce 100644 --- a/Build/source/texk/am/man1_links.am +++ b/Build/source/am/man1_links.am @@ -1,6 +1,6 @@ -## texk/am/man1_links.am: Makefile fragment for manual page links. +## am/man1_links.am: Makefile fragment for manual page links. ## -## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## requires $(man1_links) diff --git a/Build/source/am/rebuild.am b/Build/source/am/rebuild.am new file mode 100644 index 00000000000..9b53015b192 --- /dev/null +++ b/Build/source/am/rebuild.am @@ -0,0 +1,33 @@ +## am/rebuild.am: Makefile fragment to rebuild a library. +## +## Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. +## +## requires $(rebuild_prereq), $(rebuild_target), and CLEANFILES. +## +## Serialize concurrent rebuild attempts +## Compare Automake manual (info Automake) 27.9: Multiple Outputs +## +rebuild.stamp: + echo timestamp >$@ + +.PHONY: rebuild +rebuild: $(rebuild_prereq) + @dry=; for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=*|--*);; \ + *n*) dry=:;; \ + esac; \ + done; \ + $$dry rm -f rebuild.stamp; \ + $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \ + if $$dry mkdir rebuild.lock 2>/dev/null; then \ + $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \ + $$dry rmdir rebuild.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + fi; \ + $$dry test -f rebuild.stamp + +CLEANFILES += rebuild.stamp + diff --git a/Build/source/texk/am/script_links.am b/Build/source/am/script_links.am index a8986e487fb..102d56707d0 100644 --- a/Build/source/texk/am/script_links.am +++ b/Build/source/am/script_links.am @@ -1,4 +1,4 @@ -## texk/am/script_links.am: Makefile fragment for lua/perl/shell script links. +## am/script_links.am: Makefile fragment for lua/perl/shell script links. ## ## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. diff --git a/Build/source/libs/ChangeLog b/Build/source/libs/ChangeLog index 81b08a51f1a..a92317e8610 100644 --- a/Build/source/libs/ChangeLog +++ b/Build/source/libs/ChangeLog @@ -1,3 +1,7 @@ +2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/*.am: Removed Makefile fragment to ../am/. + 2013-01-03 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: XeTeX can now be built with unmodified libicu*. diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog index 2bece5835b3..6a3889d7dc0 100644 --- a/Build/source/libs/cairo/ChangeLog +++ b/Build/source/libs/cairo/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * cairo/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (SUBDIRS): Build the library first. diff --git a/Build/source/libs/cairo/cairo/Makefile.am b/Build/source/libs/cairo/cairo/Makefile.am index 231687453bc..81b7e6ff456 100644 --- a/Build/source/libs/cairo/cairo/Makefile.am +++ b/Build/source/libs/cairo/cairo/Makefile.am @@ -15,5 +15,5 @@ hdr_links = \ $(CAIRO_BLD)/cairo-features.h \ $(CAIRO_SRC)/cairo-version.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/cairo/cairo/Makefile.in b/Build/source/libs/cairo/cairo/Makefile.in index 830a48878c1..67ba6e5b313 100644 --- a/Build/source/libs/cairo/cairo/Makefile.in +++ b/Build/source/libs/cairo/cairo/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = cairo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \ @@ -231,7 +231,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -252,7 +252,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 590b699b319..ebd1a50d38a 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> Import libgd-2.1.0. diff --git a/Build/source/libs/gd/include/Makefile.am b/Build/source/libs/gd/include/Makefile.am index 35efdc31300..53f0cef14ba 100644 --- a/Build/source/libs/gd/include/Makefile.am +++ b/Build/source/libs/gd/include/Makefile.am @@ -23,5 +23,5 @@ hdr_links = \ $(GD_SRC)/gdfx.h \ $(GD_SRC)/gdpp.h -include $(top_srcdir)/../am/hdr_links.am +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 21fd205bc0c..385724f4ef6 100644 --- a/Build/source/libs/gd/include/Makefile.in +++ b/Build/source/libs/gd/include/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -267,7 +267,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -288,7 +288,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index b451a86c1c1..79e9e508fb2 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-02 Peter Breitenlohner <peb@mppmu.mpg.de> Import harfbuzz-0.9.18. diff --git a/Build/source/libs/harfbuzz/include/Makefile.am b/Build/source/libs/harfbuzz/include/Makefile.am index 82bf6e1fe8e..0eecce258fe 100644 --- a/Build/source/libs/harfbuzz/include/Makefile.am +++ b/Build/source/libs/harfbuzz/include/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install harfbuzz headers for TeX Live. ## -## Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2012-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -34,5 +34,5 @@ hdr_links += $(HARFBUZZ_SRC)/hb-icu.h ## Graphite library hdr_links += $(HARFBUZZ_SRC)/hb-graphite2.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/harfbuzz/include/Makefile.in b/Build/source/libs/harfbuzz/include/Makefile.in index e2fd75e8786..597d4b810dd 100644 --- a/Build/source/libs/harfbuzz/include/Makefile.in +++ b/Build/source/libs/harfbuzz/include/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -276,7 +276,7 @@ hdr_links = $(HARFBUZZ_SRC)/hb.h $(HARFBUZZ_SRC)/hb-blob.h \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -297,7 +297,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog index 0faf59a2a2e..2ea008b318a 100644 --- a/Build/source/libs/icu/ChangeLog +++ b/Build/source/libs/icu/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/unicode/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-03-21 Peter Breitenlohner <peb@mppmu.mpg.de> Update icu-51.1 (release). diff --git a/Build/source/libs/icu/include/unicode/Makefile.am b/Build/source/libs/icu/include/unicode/Makefile.am index f5202d22ec4..a804f0bd69f 100644 --- a/Build/source/libs/icu/include/unicode/Makefile.am +++ b/Build/source/libs/icu/include/unicode/Makefile.am @@ -16,5 +16,5 @@ hdr_links = \ $(ICU_SRC)/i18n/unicode/*.h \ $(ICU_SRC)/io/unicode/*.h -include $(top_srcdir)/../am/hdr_links.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 4781de9ef0a..ee94a1df545 100644 --- a/Build/source/libs/icu/include/unicode/Makefile.in +++ b/Build/source/libs/icu/include/unicode/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include/unicode ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -222,7 +222,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -243,7 +243,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 7802f3d4422..83677d2d471 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-29 Peter Breitenlohner <peb@mppmu.mpg.de> Import libpng-1.5.17. diff --git a/Build/source/libs/libpng/include/Makefile.am b/Build/source/libs/libpng/include/Makefile.am index 7d799db771c..35797c9eec0 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-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -13,5 +13,5 @@ hdr_links = \ $(LIBPNG_SRC)/pngconf.h \ $(LIBPNG_SRC)/pnglibconf.h -include $(top_srcdir)/../am/hdr_links.am +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 95e313d4b89..365cc457882 100644 --- a/Build/source/libs/libpng/include/Makefile.in +++ b/Build/source/libs/libpng/include/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -216,7 +216,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -237,7 +237,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog index 0aa3e9a4eb4..96bc32a2fb8 100644 --- a/Build/source/libs/lua52/ChangeLog +++ b/Build/source/libs/lua52/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2012-06-25 Peter Breitenlohner <peb@mppmu.mpg.de> Import lua-5.2.2. diff --git a/Build/source/libs/lua52/include/Makefile.am b/Build/source/libs/lua52/include/Makefile.am index 1cc17cb6ce6..a5a89ace691 100644 --- a/Build/source/libs/lua52/include/Makefile.am +++ b/Build/source/libs/lua52/include/Makefile.am @@ -35,7 +35,7 @@ hdr_links = \ $(LUA52_SRC)/lvm.h \ $(LUA52_SRC)/lzio.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am DISTCLEANFILES = lua.hpp diff --git a/Build/source/libs/lua52/include/Makefile.in b/Build/source/libs/lua52/include/Makefile.in index 5080664b055..a096bce5bac 100644 --- a/Build/source/libs/lua52/include/Makefile.in +++ b/Build/source/libs/lua52/include/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -239,7 +239,7 @@ DISTCLEANFILES = lua.hpp all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -260,7 +260,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog index 3369a2670c0..3d8e6a95839 100644 --- a/Build/source/libs/pixman/ChangeLog +++ b/Build/source/libs/pixman/ChangeLog @@ -1,3 +1,11 @@ +2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use ../am/rebuild.am. + +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (SUBDIRS): Build the library first. @@ -10,8 +18,8 @@ 2013-04-15 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Build non-libtool library. - * pixman.test: Shell script for a basic test. - * pixtest.c: Source code for test program. + * pixman.test (new): Shell script for a basic test. + * pixtest.c (new): Source code for test program. 2013-04-08 Mojca Miklavec <mojca.miklavec.lists@gmail.com> diff --git a/Build/source/libs/pixman/Makefile.am b/Build/source/libs/pixman/Makefile.am index 01bda177d82..45b9aceb549 100644 --- a/Build/source/libs/pixman/Makefile.am +++ b/Build/source/libs/pixman/Makefile.am @@ -8,10 +8,6 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -# Rebuild -.PHONY: rebuild -rebuild: all - ## We want to re-distribute the whole original pixman source tree. ## EXTRA_DIST = $(PIXMAN_TREE) @@ -49,5 +45,10 @@ pixtest_CPPFLAGS = -Iinclude LDADD = libpixman.a -## Files generated by TESTS +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = + +include $(srcdir)/../../am/rebuild.am diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in index 2d71bdb5734..6e5fa0fbcd8 100644 --- a/Build/source/libs/pixman/Makefile.in +++ b/Build/source/libs/pixman/Makefile.in @@ -76,9 +76,10 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(srcdir)/sources.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.h.in \ +DIST_COMMON = $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in \ $(top_srcdir)/pixman-0.30.0/pixman/pixman-version.h.in \ $(am__dist_check_SCRIPTS_DIST) \ $(top_srcdir)/../../build-aux/depcomp \ @@ -622,6 +623,11 @@ libpixman_a_SOURCES = $(libpixman_sources) $(libpixman_headers) pixtest_SOURCES = pixtest.c pixtest_CPPFLAGS = -Iinclude LDADD = libpixman.a + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = rebuild.stamp all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -629,7 +635,7 @@ all: config.h .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -652,7 +658,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/sources.am: +$(srcdir)/sources.am $(srcdir)/../../am/rebuild.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1345,6 +1351,7 @@ mostlyclean-generic: -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -1449,14 +1456,30 @@ uninstall-am: recheck tags tags-am uninstall uninstall-am -# Rebuild -.PHONY: rebuild -rebuild: all - # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` rm -f $(distdir)/$(PIXMAN_SRC)/pixman-version.h +rebuild.stamp: + echo timestamp >$@ + +.PHONY: rebuild +rebuild: $(rebuild_prereq) + @dry=; for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=*|--*);; \ + *n*) dry=:;; \ + esac; \ + done; \ + $$dry rm -f rebuild.stamp; \ + $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \ + if $$dry mkdir rebuild.lock 2>/dev/null; then \ + $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \ + $$dry rmdir rebuild.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + fi; \ + $$dry test -f rebuild.stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/libs/pixman/include/Makefile.am b/Build/source/libs/pixman/include/Makefile.am index ad5c20dfb2d..8e64d9f2b75 100644 --- a/Build/source/libs/pixman/include/Makefile.am +++ b/Build/source/libs/pixman/include/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to install pixman headers for TeX Live. ## -## Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2012-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -13,5 +13,5 @@ hdr_links = \ $(PIXMAN_SRC)/pixman.h \ $(PIXMAN_BLD)/pixman-version.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/pixman/include/Makefile.in b/Build/source/libs/pixman/include/Makefile.in index a0bc7ab7612..beec4251e1a 100644 --- a/Build/source/libs/pixman/include/Makefile.in +++ b/Build/source/libs/pixman/include/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -214,7 +214,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -235,7 +235,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index ade2f878ea8..9cd67d519d5 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am, include/{fofi,goo}/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de> Import poppler-0.23.3. diff --git a/Build/source/libs/poppler/include/Makefile.am b/Build/source/libs/poppler/include/Makefile.am index 017e65f42ce..c5026473e5a 100644 --- a/Build/source/libs/poppler/include/Makefile.am +++ b/Build/source/libs/poppler/include/Makefile.am @@ -10,5 +10,5 @@ SUBDIRS = goo fofi hdr_links = $(top_srcdir)/$(POPPLER_TREE)/poppler/*.h ../poppler-config.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/poppler/include/Makefile.in b/Build/source/libs/poppler/include/Makefile.in index d5ff51ac9a3..eda83b1265a 100644 --- a/Build/source/libs/poppler/include/Makefile.in +++ b/Build/source/libs/poppler/include/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -278,7 +278,7 @@ hdr_links = $(top_srcdir)/$(POPPLER_TREE)/poppler/*.h ../poppler-config.h all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -299,7 +299,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/poppler/include/fofi/Makefile.am b/Build/source/libs/poppler/include/fofi/Makefile.am index 21e306a25eb..6fa1c9b3412 100644 --- a/Build/source/libs/poppler/include/fofi/Makefile.am +++ b/Build/source/libs/poppler/include/fofi/Makefile.am @@ -8,5 +8,5 @@ ## hdr_links = $(top_srcdir)/$(POPPLER_TREE)/fofi/*.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/poppler/include/fofi/Makefile.in b/Build/source/libs/poppler/include/fofi/Makefile.in index 0b985916ad2..bd19bcf8a7e 100644 --- a/Build/source/libs/poppler/include/fofi/Makefile.in +++ b/Build/source/libs/poppler/include/fofi/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include/fofi ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -217,7 +217,7 @@ hdr_links = $(top_srcdir)/$(POPPLER_TREE)/fofi/*.h all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -238,7 +238,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/poppler/include/goo/Makefile.am b/Build/source/libs/poppler/include/goo/Makefile.am index 50704c5b01a..41f9e3a00c6 100644 --- a/Build/source/libs/poppler/include/goo/Makefile.am +++ b/Build/source/libs/poppler/include/goo/Makefile.am @@ -8,5 +8,5 @@ ## hdr_links = $(top_srcdir)/$(POPPLER_TREE)/goo/*.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/poppler/include/goo/Makefile.in b/Build/source/libs/poppler/include/goo/Makefile.in index 1cbff0ed0c8..ac629b3bca8 100644 --- a/Build/source/libs/poppler/include/goo/Makefile.in +++ b/Build/source/libs/poppler/include/goo/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include/goo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -217,7 +217,7 @@ hdr_links = $(top_srcdir)/$(POPPLER_TREE)/goo/*.h all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -238,7 +238,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/potrace/ChangeLog b/Build/source/libs/potrace/ChangeLog index 6c35e742e00..1d4397663f9 100644 --- a/Build/source/libs/potrace/ChangeLog +++ b/Build/source/libs/potrace/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-04-12 Peter Breitenlohner <peb@mppmu.mpg.de> Import potrace-1.11. diff --git a/Build/source/libs/potrace/include/Makefile.am b/Build/source/libs/potrace/include/Makefile.am index e165c1a3ce3..63dd9b588d4 100644 --- a/Build/source/libs/potrace/include/Makefile.am +++ b/Build/source/libs/potrace/include/Makefile.am @@ -11,5 +11,5 @@ POTRACE_SRC = $(top_srcdir)/$(POTRACE_TREE)/src hdr_links = \ $(POTRACE_SRC)/potracelib.h -include $(top_srcdir)/../am/hdr_links.am +include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/potrace/include/Makefile.in b/Build/source/libs/potrace/include/Makefile.in index e80cb4f1971..df051c9e43f 100644 --- a/Build/source/libs/potrace/include/Makefile.in +++ b/Build/source/libs/potrace/include/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -208,7 +208,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -229,7 +229,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index af218ab1170..c2ca6e769a1 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/teckit/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (SUBDIRS): Build the library first. diff --git a/Build/source/libs/teckit/include/teckit/Makefile.am b/Build/source/libs/teckit/include/teckit/Makefile.am index 072f9c4681b..1f7b333a68b 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-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -13,5 +13,5 @@ hdr_links = \ $(TECKIT_SRC)/TECkit_Compiler.h \ $(TECKIT_SRC)/TECkit_Engine.h -include $(top_srcdir)/../am/hdr_links.am +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 1dc43f7c811..730e959c8ea 100644 --- a/Build/source/libs/teckit/include/teckit/Makefile.in +++ b/Build/source/libs/teckit/include/teckit/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include/teckit ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -232,7 +232,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -253,7 +253,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index 977476df01e..95bd1dbd247 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/{fofi,goo,splash,xpdf}/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (SUBDIRS): Build the library first. diff --git a/Build/source/libs/xpdf/fofi/Makefile.am b/Build/source/libs/xpdf/fofi/Makefile.am index ed3ad8ebd3a..7350884a54a 100644 --- a/Build/source/libs/xpdf/fofi/Makefile.am +++ b/Build/source/libs/xpdf/fofi/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build xpdf FoFi library for TeX Live. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,5 +8,5 @@ ## hdr_links = $(top_srcdir)/$(XPDF_TREE)/fofi/*.h -include $(top_srcdir)/../am/hdr_links.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 82f9f0621d5..9d81350422c 100644 --- a/Build/source/libs/xpdf/fofi/Makefile.in +++ b/Build/source/libs/xpdf/fofi/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = fofi ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -211,7 +211,7 @@ hdr_links = $(top_srcdir)/$(XPDF_TREE)/fofi/*.h all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -232,7 +232,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/xpdf/goo/Makefile.am b/Build/source/libs/xpdf/goo/Makefile.am index 84630d02255..39eb796373c 100644 --- a/Build/source/libs/xpdf/goo/Makefile.am +++ b/Build/source/libs/xpdf/goo/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build xpdf Goo library for TeX Live. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,5 +8,5 @@ ## hdr_links = $(top_srcdir)/$(XPDF_TREE)/goo/*.h -include $(top_srcdir)/../am/hdr_links.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 aaabd321870..12c141a5dd1 100644 --- a/Build/source/libs/xpdf/goo/Makefile.in +++ b/Build/source/libs/xpdf/goo/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = goo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -211,7 +211,7 @@ hdr_links = $(top_srcdir)/$(XPDF_TREE)/goo/*.h all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -232,7 +232,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/xpdf/splash/Makefile.am b/Build/source/libs/xpdf/splash/Makefile.am index 4c7d5029d0b..0867c61f1c9 100644 --- a/Build/source/libs/xpdf/splash/Makefile.am +++ b/Build/source/libs/xpdf/splash/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build xpdf Xpdf library for TeX Live. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,5 +8,5 @@ ## hdr_links = $(top_srcdir)/$(XPDF_TREE)/splash/*.h -include $(top_srcdir)/../am/hdr_links.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 b9ccb625161..204c5647296 100644 --- a/Build/source/libs/xpdf/splash/Makefile.in +++ b/Build/source/libs/xpdf/splash/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = splash ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -211,7 +211,7 @@ hdr_links = $(top_srcdir)/$(XPDF_TREE)/splash/*.h all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -232,7 +232,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/xpdf/xpdf/Makefile.am b/Build/source/libs/xpdf/xpdf/Makefile.am index 971273a2cd5..dcfc97af8b1 100644 --- a/Build/source/libs/xpdf/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/xpdf/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build xpdf Xpdf library for TeX Live. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,5 +8,5 @@ ## hdr_links = $(top_srcdir)/$(XPDF_TREE)/xpdf/*.h -include $(top_srcdir)/../am/hdr_links.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 e751394feef..a95c8369110 100644 --- a/Build/source/libs/xpdf/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/xpdf/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = xpdf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -211,7 +211,7 @@ hdr_links = $(top_srcdir)/$(XPDF_TREE)/xpdf/*.h all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -232,7 +232,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog index 45fd5261d52..f56c393e9cb 100644 --- a/Build/source/libs/zlib/ChangeLog +++ b/Build/source/libs/zlib/ChangeLog @@ -1,3 +1,11 @@ +2012-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use ../am/rebuild.am. + +2012-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2012-05-18 Peter Breitenlohner <peb@mppmu.mpg.de> Import zlib-1.2.8. diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am index 03a015a8927..7fce7d03e99 100644 --- a/Build/source/libs/zlib/Makefile.am +++ b/Build/source/libs/zlib/Makefile.am @@ -8,15 +8,8 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -# Rebuild -.PHONY: rebuild -rebuild: all - ## We want to re-distribute the whole original zlib source tree. ## -## With current automake (1.10.2) 'make distcheck' fails when -## DISTFILES contains a directory and files in that directory. -## Thus nodist_* for all files in $(ZLIB_TREE). EXTRA_DIST = $(ZLIB_TREE) ## Changes applied to the original source tree @@ -62,11 +55,14 @@ nodist_libz_a_SOURCES = \ $(libz_a_OBJECTS): zconf.h +## Tests +## if build check_PROGRAMS = example minigzip dist_check_SCRIPTS = zlib.test TESTS = zlib.test endif build +CLEANFILES = foo.gz foo_gz LDADD = libz.a @@ -79,6 +75,9 @@ zconf.h: $(ZLIB_TREE)/zconf.h.in config.status DISTCLEANFILES = zconf.h -## Files generated by TESTS -CLEANFILES = foo.gz foo_gz +# Rebuild +rebuild_prereq = +rebuild_target = all + +include $(srcdir)/../../am/rebuild.am diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index c54f792a981..47794e687af 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -77,10 +77,10 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @build_TRUE@check_PROGRAMS = example$(EXEEXT) minigzip$(EXEEXT) -subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(am__dist_check_SCRIPTS_DIST) \ +DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(srcdir)/config.h.in \ + $(am__dist_check_SCRIPTS_DIST) \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/test-driver ChangeLog README \ ../../build-aux/compile ../../build-aux/config.guess \ @@ -91,6 +91,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-largefile.m4 \ @@ -578,11 +579,15 @@ nodist_libz_a_SOURCES = \ @build_TRUE@dist_check_SCRIPTS = zlib.test @build_TRUE@TESTS = zlib.test +CLEANFILES = foo.gz foo_gz rebuild.stamp LDADD = libz.a nodist_example_SOURCES = @ZLIB_TREE@/test/example.c nodist_minigzip_SOURCES = @ZLIB_TREE@/test/minigzip.c DISTCLEANFILES = zconf.h -CLEANFILES = foo.gz foo_gz + +# Rebuild +rebuild_prereq = +rebuild_target = all all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -590,7 +595,7 @@ all: config.h .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -613,6 +618,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/../../am/rebuild.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1338,10 +1344,6 @@ uninstall-am: recheck tags tags-am uninstall uninstall-am -# Rebuild -.PHONY: rebuild -rebuild: all - # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` @@ -1352,6 +1354,26 @@ $(libz_a_OBJECTS): zconf.h zconf.h: $(ZLIB_TREE)/zconf.h.in config.status echo '$(SHELL) ./config.status $@' $(SHELL) ./config.status $@ +rebuild.stamp: + echo timestamp >$@ + +.PHONY: rebuild +rebuild: $(rebuild_prereq) + @dry=; for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=*|--*);; \ + *n*) dry=:;; \ + esac; \ + done; \ + $$dry rm -f rebuild.stamp; \ + $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \ + if $$dry mkdir rebuild.lock 2>/dev/null; then \ + $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \ + $$dry rmdir rebuild.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + fi; \ + $$dry test -f rebuild.stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/libs/zlib/include/Makefile.am b/Build/source/libs/zlib/include/Makefile.am index 6ee82c6187b..97c40ab1a82 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-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -13,5 +13,5 @@ hdr_links = \ $(ZLIB_SRC)/zlib.h \ $(ZLIB_BLD)/zconf.h -include $(top_srcdir)/../am/hdr_links.am +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 bff687e4a49..5e9167ca946 100644 --- a/Build/source/libs/zlib/include/Makefile.in +++ b/Build/source/libs/zlib/include/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -215,7 +215,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -236,7 +236,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index 488c0d1fa20..181ce169459 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (SUBDIRS): Build the library first. diff --git a/Build/source/libs/zziplib/include/zzip/Makefile.am b/Build/source/libs/zziplib/include/zzip/Makefile.am index 6d39938f291..4ff3b5f447a 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-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -22,5 +22,5 @@ hdr_links = \ $(ZZIPLIB_SRC)/write.h \ $(ZZIPLIB_SRC)/zzip.h -include $(top_srcdir)/../am/hdr_links.am +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 476bfde083d..eb0a7fb7e2e 100644 --- a/Build/source/libs/zziplib/include/zzip/Makefile.in +++ b/Build/source/libs/zziplib/include/zzip/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include/zzip ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \ @@ -237,7 +237,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -258,7 +258,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index b36562f1cf2..66698ad2764 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,7 @@ +2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/*.am: Removed Makefile fragment to ../am/. + 2013-03-19 Peter Breitenlohner <peb@mppmu.mpg.de> Merge bibtex8/ and bibtexu/ into bibtex-x/. diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog index b22459b702d..51e44cc9a32 100644 --- a/Build/source/texk/chktex/ChangeLog +++ b/Build/source/texk/chktex/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-05-30 Peter Breitenlohner <peb@mppmu.mpg.de> Import chktex-1.7.2. diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am index 46d469e11b9..d1f9fa32157 100644 --- a/Build/source/texk/chktex/Makefile.am +++ b/Build/source/texk/chktex/Makefile.am @@ -77,7 +77,7 @@ sh_scripts = chkweb scriptsdir = texmf-dist/scripts/chktex nodist_bin_SCRIPTS = -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index 0d01cd174d9..def26017082 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -85,10 +85,10 @@ bin_PROGRAMS = chktex$(EXEEXT) @MINGW32_TRUE@ regex/regex.c \ @MINGW32_TRUE@ regex/regex.h -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(top_srcdir)/chktex-1.7.2/deweb.in \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(srcdir)/config.h.in \ + $(top_srcdir)/chktex-1.7.2/deweb.in \ $(top_srcdir)/../../build-aux/depcomp $(dist_pdfdoc_DATA) \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ @@ -618,7 +618,7 @@ all: config.h .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -641,7 +641,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../texk/am/script_links.am: +$(srcdir)/../../am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 2332196ce83..8897ee493b0 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (hbf2gf_cfgdir): Change texmf => texmf-dist. diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am index e6dc65de597..4ef526b7e55 100644 --- a/Build/source/texk/cjkutils/Makefile.am +++ b/Build/source/texk/cjkutils/Makefile.am @@ -64,7 +64,7 @@ else !WIN32 bin_links = gbklatex:bg5+latex gbkpdflatex:bg5+pdflatex endif !WIN32 -include $(srcdir)/../am/bin_links.am +include $(srcdir)/../../am/bin_links.am gbklatex_SOURCES = \ @CJKUTILS_TREE@/cjklatex/cjklatex.c diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in index 6a3338ca6d8..3120d986612 100644 --- a/Build/source/texk/cjkutils/Makefile.in +++ b/Build/source/texk/cjkutils/Makefile.in @@ -87,7 +87,7 @@ bin_PROGRAMS = bg5conv$(EXEEXT) cefconv$(EXEEXT) cef5conv$(EXEEXT) \ @WIN32_TRUE@ gbklatex \ @WIN32_TRUE@ gbkpdflatex -DIST_COMMON = $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/../../am/bin_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ $(top_srcdir)/../../build-aux/depcomp \ @@ -662,7 +662,7 @@ all: c-auto.h .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -685,7 +685,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../am/bin_links.am: +$(srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog index beee994cbb6..b9a2f8af8e3 100644 --- a/Build/source/texk/dviljk/ChangeLog +++ b/Build/source/texk/dviljk/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-03-15 Peter Breitenlohner <peb@mppmu.mpg.de> * dvi2xx.c: use '(void)AssureBinary' to avoid compiler warning. diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am index dbe2dd619d7..03adfa73e44 100644 --- a/Build/source/texk/dviljk/Makefile.am +++ b/Build/source/texk/dviljk/Makefile.am @@ -58,7 +58,7 @@ dvilj6_LDADD = bin_links = dvilj4$(EXEEXT):dvilj6 -include $(top_srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am dist_man1_MANS = dvihp.man dvilj.man @@ -68,7 +68,7 @@ man1_links = \ dvilj:dvilj4l \ dvilj:dvilj6 -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am install-exec-hook: install-bin-links diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in index 836d253d10b..951bf49c698 100644 --- a/Build/source/texk/dviljk/Makefile.in +++ b/Build/source/texk/dviljk/Makefile.in @@ -83,8 +83,8 @@ host_triplet = @host@ bin_PROGRAMS = dvilj$(EXEEXT) dvilj2p$(EXEEXT) dvilj4$(EXEEXT) \ dvilj4l$(EXEEXT) $(am__EXEEXT_1) @WIN32_TRUE@am__append_1 = dvilj6 -DIST_COMMON = $(top_srcdir)/../am/bin_links.am \ - $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ + $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ $(top_srcdir)/../texlive/w32_wrapper/callexe.c \ @@ -483,7 +483,7 @@ all: c-auto.h .SUFFIXES: .c .lo .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -506,7 +506,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am: +$(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index f3bb907f286..9a926beb2be 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -12,6 +12,8 @@ cff.c, dvi.[ch], cidtype0.c, cidtype2.c, dvipdfmx.c, fontmap.c, pdfcolor.[ch], truetype.c, tt_aux.[ch], type1c.c. + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-07-03 Peter Breitenlohner <peb@mppmu.mpg.de> * Removed diffs between src/ and xsrc/ version of these files diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index 960499db6e5..b2eb804e60b 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -249,7 +249,7 @@ endif DVIPDFMX call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\" nodist_call_dvipdfmx_SOURCES = callexe.c -include $(srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am ## Manpages ## @@ -262,7 +262,7 @@ dist_man1_MANS = man/dvipdfm.1 man/dvipdft.1 man/extractbb.1 man1_links += extractbb:ebb endif DVIPDFMX -include $(srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am ## Data ## diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index 6dedbb942f2..2015ede9c5e 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -90,8 +90,8 @@ EXTRA_PROGRAMS = dvipdfmx$(EXEEXT) xdvipdfmx$(EXEEXT) @DVIPDFMX_TRUE@ dvipdfmx$(EXEEXT):ebb \ @DVIPDFMX_TRUE@ dvipdfmx$(EXEEXT):extractbb -DIST_COMMON = $(srcdir)/../am/bin_links.am \ - $(srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ + $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/config.h.in \ $(top_srcdir)/../texlive/w32_wrapper/callexe.c \ @@ -907,7 +907,7 @@ all: config.h .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -930,7 +930,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../am/bin_links.am $(srcdir)/../am/man1_links.am: +$(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 423687e527e..eede51b66d7 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,13 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, doc/Makefile.am: + Moved Makefile fragments to ../../am/. + +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * dvipng.test: ALso run 'dvipng --gif'. + * Makefile.am (CLEANFILES): Adapted. + 2013-05-19 Peter Breitenlohner <peb@mppmu.mpg.de> * version.ac (new): Define dvipng version. diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index 5093a596ab3..641a39d92d6 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -89,7 +89,7 @@ dvigif_LDADD = ## Rebuild gd @GD_RULE@ -include $(srcdir)/../am/bin_links.am +include $(srcdir)/../../am/bin_links.am bin_links = dvipng$(EXEEXT):dvigif @@ -106,5 +106,5 @@ TESTS = dvipng.test EXTRA_DIST += dvipng.test dvipng-test.dvi -CLEANFILES = dvipng-test*.png +CLEANFILES = dvipng-test*.gif dvipng-test*.png diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 08fcb30640a..33c42843e63 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -86,7 +86,7 @@ bin_PROGRAMS = dvipng$(EXEEXT) $(am__EXEEXT_1) @have_ft2_TRUE@ @DVIPNG_TREE@/sfd.c \ @have_ft2_TRUE@ @DVIPNG_TREE@/tfm.c -DIST_COMMON = $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/../../am/bin_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/config.h.in \ $(top_srcdir)/../texlive/w32_wrapper/callexe.c \ @@ -657,7 +657,7 @@ nodist_dvigif_SOURCES = callexe.c dvigif_LDADD = bin_links = dvipng$(EXEEXT):dvigif TESTS = dvipng.test -CLEANFILES = dvipng-test*.png +CLEANFILES = dvipng-test*.gif dvipng-test*.png all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -665,7 +665,7 @@ all: config.h .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -688,7 +688,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../am/bin_links.am: +$(srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/dvipng/doc/Makefile.am b/Build/source/texk/dvipng/doc/Makefile.am index 7be4acd76e4..a0deb0c362c 100644 --- a/Build/source/texk/dvipng/doc/Makefile.am +++ b/Build/source/texk/dvipng/doc/Makefile.am @@ -42,7 +42,7 @@ dvipng.1: dvipng.texi readme.texi # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = dvipng:dvigif -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am if have_gif install-data-hook: install-man1-links diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in index 1a8f8194a1d..ba8fc30f957 100644 --- a/Build/source/texk/dvipng/doc/Makefile.in +++ b/Build/source/texk/dvipng/doc/Makefile.in @@ -78,10 +78,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(dist_noinst_SCRIPTS) \ - $(dvipng_TEXINFOS) $(top_srcdir)/../../build-aux/texinfo.tex \ - $(dist_man1_MANS) +DIST_COMMON = $(top_srcdir)/../../am/man1_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_noinst_SCRIPTS) $(dvipng_TEXINFOS) \ + $(top_srcdir)/../../build-aux/texinfo.tex $(dist_man1_MANS) subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \ @@ -363,7 +363,7 @@ all: $(BUILT_SOURCES) .SUFFIXES: .SUFFIXES: .dvi .html .info .pdf .ps .texi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -384,7 +384,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/man1_links.am: +$(top_srcdir)/../../am/man1_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/texk/dvipng/dvipng.test b/Build/source/texk/dvipng/dvipng.test index baaba3c8b77..8aa8eaba249 100755 --- a/Build/source/texk/dvipng/dvipng.test +++ b/Build/source/texk/dvipng/dvipng.test @@ -24,4 +24,8 @@ export TEXMFCNF TEXFONTMAPS ENCFONTS TEXMFMAIN TEXMFDIST TEXMFLOCAL ./dvipng -T tight -strict $srcdir/dvipng-test.dvi || exit 1 -echo View the result e.g. with display dvipng-test\*.png +echo View the result e.g. with display dvipng-test\*.png + +./dvipng --gif -T tight -strict $srcdir/dvipng-test.dvi || exit 1 + +echo View the result e.g. with display dvipng-test\*.gif diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index af188846fb5..36d266546d8 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -4,6 +4,11 @@ in path names to the cases CP936 (simplified Chinese) and CP950 (traditional Chinese). +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, man/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-07-01 Peter Breitenlohner <peb@mppmu.mpg.de> * c-memstr.h: Drop mapping of BSD => SYSV/ANSI string functions. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 1c9cc009304..37b104c2c7a 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -289,7 +289,7 @@ endif !WIN32 bin_links = mktexlsr:texhash -include $(top_srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am install-exec-hook: install-bin-links diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 8bb4c6d33ed..3c11138aa7c 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -106,14 +106,15 @@ host_triplet = @host@ bin_PROGRAMS = kpseaccess$(EXEEXT) kpsereadlink$(EXEEXT) \ kpsestat$(EXEEXT) kpsewhich$(EXEEXT) EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT) -DIST_COMMON = $(top_srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/c-auto.in strcasecmp.c \ - strstr.c putenv.c strtol.c $(dist_noinst_SCRIPTS) \ - $(dist_web2c_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \ - $(dist_noinst_DATA) $(dist_web2c_DATA) $(kpseinclude_HEADERS) \ - $(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \ - AUTHORS ChangeLog NEWS README ../../build-aux/compile \ +DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/c-auto.in strcasecmp.c strstr.c putenv.c strtol.c \ + $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \ + $(top_srcdir)/../../build-aux/depcomp $(dist_noinst_DATA) \ + $(dist_web2c_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \ + $(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \ + NEWS README ../../build-aux/compile \ ../../build-aux/config.guess ../../build-aux/config.sub \ ../../build-aux/depcomp ../../build-aux/install-sh \ ../../build-aux/missing ../../build-aux/texinfo.tex \ @@ -789,7 +790,7 @@ all: $(BUILT_SOURCES) c-auto.h .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -812,7 +813,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/../am/bin_links.am: +$(top_srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/kpathsea/man/Makefile.am b/Build/source/texk/kpathsea/man/Makefile.am index f2633d5df52..ea9e6fe16fc 100644 --- a/Build/source/texk/kpathsea/man/Makefile.am +++ b/Build/source/texk/kpathsea/man/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/kpathsea/man/ ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## man_sources = \ @@ -17,13 +17,13 @@ EXTRA_DIST = $(man_sources) KPATHSEA_PATHS_H = ${top_builddir}/.. -include $(top_srcdir)/../am/man.am +include $(top_srcdir)/../../am/man.am # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = \ mktexlsr:texhash -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am install-data-hook: install-man1-links diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in index 9c2031969c6..33d685076fd 100644 --- a/Build/source/texk/kpathsea/man/Makefile.in +++ b/Build/source/texk/kpathsea/man/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/man.am \ - $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(top_srcdir)/../../am/man.am \ + $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -301,7 +301,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .1 .man .ps .dvi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -322,7 +322,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/man.am $(top_srcdir)/../am/man1_links.am: +$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index 1670bc8d3f3..d12864df2be 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de> * t4ht.c, tex4ht.c: Always include system headers after diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index e6d22850498..4f3095c2b03 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/tex4htk/ ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -33,7 +33,7 @@ shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex scriptsdir = texmf-dist/scripts/tex4ht nodist_bin_SCRIPTS = -include $(srcdir)/../am/script_links.am +include $(srcdir)/../../am/script_links.am texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 928baa6f37e..2d00d651e12 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -80,7 +80,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = t4ht$(EXEEXT) tex4ht$(EXEEXT) -DIST_COMMON = $(srcdir)/../am/script_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ $(am__dist_bin_SCRIPTS_DIST) $(dist_texmf_SCRIPTS) \ @@ -405,7 +405,7 @@ all: c-auto.h .SUFFIXES: .c .lo .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -428,7 +428,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../am/script_links.am: +$(srcdir)/../../am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index e1099626f19..2af32b58aff 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * tl_scripts/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-04-19 Peter Breitenlohner <peb@mppmu.mpg.de> * tests/updmap-cmdline-test.pl: Adapt to updmap.pl again moved. diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am index 0bd604c140e..8c3bfabd78a 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.am +++ b/Build/source/texk/texlive/tl_scripts/Makefile.am @@ -45,7 +45,7 @@ sh_scripts = \ nodist_bin_SCRIPTS = scriptsdir = texmf-dist/scripts/texlive # -include $(srcdir)/../../../texk/am/script_links.am +include $(top_srcdir)/../../am/script_links.am # texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(sh_scripts:=.sh) @@ -80,7 +80,7 @@ bin_links = \ kpsetool:kpsexpand \ kpsetool:kpsepath -include $(top_srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am man1_links = \ fmtutil:fmtutil-sys \ @@ -90,7 +90,7 @@ man1_links = \ texconfig:texconfig-sys \ updmap:updmap-sys -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am ## Support files texconfigdir = $(datarootdir)/texmf-dist/texconfig diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index 3aaf8a3100e..b47f9d5baa3 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -77,9 +77,9 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(srcdir)/../../../texk/am/script_links.am \ - $(top_srcdir)/../am/bin_links.am \ - $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(top_srcdir)/../../am/script_links.am \ + $(top_srcdir)/../../am/bin_links.am \ + $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(dist_texconfig_SCRIPTS) \ $(dist_texmf_SCRIPTS) $(dist_man_MANS) $(dist_texconfig_DATA) \ $(dist_web2c_DATA) ChangeLog README @@ -321,7 +321,7 @@ all_shell_scripts = $(shell_scripts) $(sh_scripts) all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../../texk/am/script_links.am $(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -342,7 +342,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; -$(srcdir)/../../../texk/am/script_links.am $(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am: +$(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 34a482ad2a7..d006b3f19cd 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, man/Makefile.am, omegafonts/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-07-04 Peter Breitenlohner <peb@mppmu.mpg.de> * tests/1-4.jpg, tests/basic.tex, tests/lily-ledger-broken.png: diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 80c6bde623b..83eae378c1e 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -234,7 +234,7 @@ include $(srcdir)/synctexdir/am/synctex.am include $(srcdir)/libmd5/am/md5.am ## Symlinks within $(bindir) -include $(srcdir)/../am/bin_links.am +include $(srcdir)/../../am/bin_links.am install-exec-hook: install-bin-links $(install_exe_links) uninstall-hook: uninstall-bin-links $(uninstall_exe_links) diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 1e870a16e5c..39081ed0ec3 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -128,7 +128,7 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \ $(srcdir)/omegaware/am/omegaware.am \ $(srcdir)/alephdir/am/aleph.am \ $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am \ - $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ + $(srcdir)/../../am/bin_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ $(top_srcdir)/luatexdir/luafontloader/ff-config.in \ @@ -3117,7 +3117,7 @@ all: ff-config.h .SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -3139,7 +3139,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../am/bin_links.am: +$(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am index bcedd1f9e75..b624a86b670 100644 --- a/Build/source/texk/web2c/man/Makefile.am +++ b/Build/source/texk/web2c/man/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/web2c/man/ ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## man_sources = $(bootstrap_man_sources) @@ -80,9 +80,9 @@ misc_man_sources = \ latex.man \ pdfetex.man -include $(top_srcdir)/../am/man.am +include $(top_srcdir)/../../am/man.am -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am install-data-hook: install-man1-links diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index a6ab9e5afc7..95a1fd7b9f5 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -92,8 +92,8 @@ host_triplet = @host@ @OTANGLE_TRUE@am__append_13 = dvicopy:odvicopy dvitype:odvitype tangle:otangle @ALEPH_TRUE@am__append_14 = aleph.man @ALEPH_TRUE@am__append_15 = aleph:lamed -DIST_COMMON = $(top_srcdir)/../am/man.am \ - $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(top_srcdir)/../../am/man.am \ + $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am ChangeLog README subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -433,7 +433,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .1 .man .ps .dvi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -454,7 +454,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/man.am $(top_srcdir)/../am/man1_links.am: +$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am index 6f65f9ebe00..7e7fb7b6000 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.am +++ b/Build/source/texk/web2c/omegafonts/Makefile.am @@ -79,7 +79,7 @@ bin_links = \ omfonts$(EXEEXT):ovf2ovp \ omfonts$(EXEEXT):ovp2ovf -include $(top_srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am if OTANGLE if OMFONTS diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 89d2637065c..5fa5a92b7b3 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -83,9 +83,9 @@ bin_PROGRAMS = $(am__EXEEXT_1) @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@noinst_PROGRAMS = \ @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ call_omfonts$(EXEEXT) EXTRA_PROGRAMS = omfonts$(EXEEXT) -DIST_COMMON = $(top_srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am pl-parser.h pl-parser.c pl-lexer.c \ - $(top_srcdir)/../../build-aux/depcomp \ +DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am pl-parser.h \ + pl-parser.c pl-lexer.c $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/ylwrap \ $(top_srcdir)/../../build-aux/test-driver ChangeLog subdir = omegafonts @@ -712,7 +712,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .l .lo .log .o .obj .test .test$(EXEEXT) .trs .y -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -733,7 +733,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/bin_links.am: +$(top_srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh diff --git a/Build/source/utils/ps2eps/ChangeLog b/Build/source/utils/ps2eps/ChangeLog index 2ec3e19025b..01176676ab5 100644 --- a/Build/source/utils/ps2eps/ChangeLog +++ b/Build/source/utils/ps2eps/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (scriptsdir): Change texmf => texmf-dist. diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am index e5b7f0d1d95..84cdba07ce7 100644 --- a/Build/source/utils/ps2eps/Makefile.am +++ b/Build/source/utils/ps2eps/Makefile.am @@ -29,7 +29,7 @@ perl_scripts = ps2eps scriptsdir = texmf-dist/scripts/ps2eps nodist_bin_SCRIPTS = -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in index 99791ad099a..4dfef1bcb90 100644 --- a/Build/source/utils/ps2eps/Makefile.in +++ b/Build/source/utils/ps2eps/Makefile.in @@ -78,10 +78,9 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = bbox$(EXEEXT) -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(top_srcdir)/../../build-aux/depcomp \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ @@ -507,7 +506,7 @@ all: all-am .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -530,7 +529,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../texk/am/script_links.am: +$(srcdir)/../../am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog index 2d24c279958..52e7aad99db 100644 --- a/Build/source/utils/psutils/ChangeLog +++ b/Build/source/utils/psutils/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (scriptsdir): Change texmf => texmf-dist. diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am index 4b9253eb2ca..983519af11a 100644 --- a/Build/source/utils/psutils/Makefile.am +++ b/Build/source/utils/psutils/Makefile.am @@ -96,7 +96,7 @@ sh_scripts = \ scriptsdir = texmf-dist/scripts/psutils nodist_bin_SCRIPTS = -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in index bd2605064e6..0786b3ed0fb 100644 --- a/Build/source/utils/psutils/Makefile.in +++ b/Build/source/utils/psutils/Makefile.in @@ -79,10 +79,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = epsffit$(EXEEXT) psbook$(EXEEXT) psnup$(EXEEXT) \ psresize$(EXEEXT) psselect$(EXEEXT) pstops$(EXEEXT) -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(top_srcdir)/psutils-1.17/patchlev.h.in \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(top_srcdir)/psutils-1.17/patchlev.h.in \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ @@ -618,7 +617,7 @@ all: all-am .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -641,7 +640,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../texk/am/script_links.am: +$(srcdir)/../../am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/utils/texdoctk/ChangeLog b/Build/source/utils/texdoctk/ChangeLog index c301afb7021..150ae366ad4 100644 --- a/Build/source/utils/texdoctk/ChangeLog +++ b/Build/source/utils/texdoctk/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (scriptsdir): Change texmf => texmf-dist. diff --git a/Build/source/utils/texdoctk/Makefile.am b/Build/source/utils/texdoctk/Makefile.am index b33291b547d..41da8a36950 100644 --- a/Build/source/utils/texdoctk/Makefile.am +++ b/Build/source/utils/texdoctk/Makefile.am @@ -13,7 +13,7 @@ perl_scripts = texdoctk scriptsdir = texmf-dist/scripts/texdoctk nodist_bin_SCRIPTS = # -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am # texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = texdoctk.pl diff --git a/Build/source/utils/texdoctk/Makefile.in b/Build/source/utils/texdoctk/Makefile.in index f05e87dc6b1..0018ca01e0f 100644 --- a/Build/source/utils/texdoctk/Makefile.in +++ b/Build/source/utils/texdoctk/Makefile.in @@ -76,15 +76,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(dist_texmf_SCRIPTS) $(dist_man1_MANS) ChangeLog README \ - ../../build-aux/compile ../../build-aux/config.guess \ - ../../build-aux/config.sub ../../build-aux/depcomp \ - ../../build-aux/install-sh ../../build-aux/missing \ - ../../build-aux/texinfo.tex ../../build-aux/ylwrap \ - ../../build-aux/ltmain.sh \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(dist_texmf_SCRIPTS) $(dist_man1_MANS) \ + ChangeLog README ../../build-aux/compile \ + ../../build-aux/config.guess ../../build-aux/config.sub \ + ../../build-aux/depcomp ../../build-aux/install-sh \ + ../../build-aux/missing ../../build-aux/texinfo.tex \ + ../../build-aux/ylwrap ../../build-aux/ltmain.sh \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing @@ -278,7 +277,7 @@ all: all-am .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -301,7 +300,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../texk/am/script_links.am: +$(srcdir)/../../am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index b449cd76ffb..728b100dc00 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-20 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac, ac/xindy.ac: Fixed some typos, replacing diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am index 964c10b613e..141ddc0e642 100644 --- a/Build/source/utils/xindy/Makefile.am +++ b/Build/source/utils/xindy/Makefile.am @@ -53,7 +53,7 @@ perl_scripts = texindy xindy scriptsdir = texmf-dist/scripts/xindy nodist_bin_SCRIPTS = -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am install-data-hook: install-perl-links diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index 37cbb2c9d0c..6c4edc141c4 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -77,14 +77,13 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) ChangeLog \ - ../../build-aux/compile ../../build-aux/config.guess \ - ../../build-aux/config.sub ../../build-aux/depcomp \ - ../../build-aux/install-sh ../../build-aux/missing \ - ../../build-aux/texinfo.tex ../../build-aux/ylwrap \ - ../../build-aux/ltmain.sh \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) ChangeLog ../../build-aux/compile \ + ../../build-aux/config.guess ../../build-aux/config.sub \ + ../../build-aux/depcomp ../../build-aux/install-sh \ + ../../build-aux/missing ../../build-aux/texinfo.tex \ + ../../build-aux/ylwrap ../../build-aux/ltmain.sh \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ @@ -366,7 +365,7 @@ all: all-recursive .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -389,7 +388,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../texk/am/script_links.am: +$(srcdir)/../../am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/utils/xpdfopen/ChangeLog b/Build/source/utils/xpdfopen/ChangeLog index b40b6e4f743..acca86064b2 100644 --- a/Build/source/utils/xpdfopen/ChangeLog +++ b/Build/source/utils/xpdfopen/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2012-12-15 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Use KPSE_BASIC to enable silent rules. diff --git a/Build/source/utils/xpdfopen/Makefile.am b/Build/source/utils/xpdfopen/Makefile.am index 9c259383f83..0e1a2e6909a 100644 --- a/Build/source/utils/xpdfopen/Makefile.am +++ b/Build/source/utils/xpdfopen/Makefile.am @@ -23,7 +23,7 @@ dist_man1_MANS = pdfopen.1 # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = pdfopen:pdfclose -include $(top_srcdir)/../../texk/am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am install-data-hook: install-man1-links diff --git a/Build/source/utils/xpdfopen/Makefile.in b/Build/source/utils/xpdfopen/Makefile.in index 1ff47671f7d..73bfc3378a3 100644 --- a/Build/source/utils/xpdfopen/Makefile.in +++ b/Build/source/utils/xpdfopen/Makefile.in @@ -77,7 +77,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = pdfopen$(EXEEXT) pdfclose$(EXEEXT) -DIST_COMMON = $(top_srcdir)/../../texk/am/man1_links.am \ +DIST_COMMON = $(top_srcdir)/../../am/man1_links.am \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(top_srcdir)/../../build-aux/depcomp $(dist_man1_MANS) \ @@ -327,7 +327,7 @@ all: all-am .SUFFIXES: .c .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../texk/am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -350,7 +350,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/../../texk/am/man1_links.am: +$(top_srcdir)/../../am/man1_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck |