summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-06 09:40:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-06 09:40:06 +0000
commit832b5ce3848de5ca76c493570fc066f450ec8011 (patch)
tree52b629b6cd51b3769658ae55dc1f511c0bcac222 /Build/source/libs
parent7d7828afcc587d0e0889fb0a62cdfe25c53cb9d2 (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
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/ChangeLog4
-rw-r--r--Build/source/libs/am/hdr_links.am20
-rw-r--r--Build/source/libs/cairo/ChangeLog4
-rw-r--r--Build/source/libs/cairo/cairo/Makefile.am2
-rw-r--r--Build/source/libs/cairo/cairo/Makefile.in8
-rw-r--r--Build/source/libs/gd/ChangeLog4
-rw-r--r--Build/source/libs/gd/include/Makefile.am2
-rw-r--r--Build/source/libs/gd/include/Makefile.in8
-rw-r--r--Build/source/libs/harfbuzz/ChangeLog4
-rw-r--r--Build/source/libs/harfbuzz/include/Makefile.am4
-rw-r--r--Build/source/libs/harfbuzz/include/Makefile.in8
-rw-r--r--Build/source/libs/icu/ChangeLog5
-rw-r--r--Build/source/libs/icu/include/unicode/Makefile.am2
-rw-r--r--Build/source/libs/icu/include/unicode/Makefile.in8
-rw-r--r--Build/source/libs/libpng/ChangeLog4
-rw-r--r--Build/source/libs/libpng/include/Makefile.am4
-rw-r--r--Build/source/libs/libpng/include/Makefile.in8
-rw-r--r--Build/source/libs/lua52/ChangeLog4
-rw-r--r--Build/source/libs/lua52/include/Makefile.am2
-rw-r--r--Build/source/libs/lua52/include/Makefile.in8
-rw-r--r--Build/source/libs/pixman/ChangeLog12
-rw-r--r--Build/source/libs/pixman/Makefile.am11
-rw-r--r--Build/source/libs/pixman/Makefile.in41
-rw-r--r--Build/source/libs/pixman/include/Makefile.am4
-rw-r--r--Build/source/libs/pixman/include/Makefile.in8
-rw-r--r--Build/source/libs/poppler/ChangeLog5
-rw-r--r--Build/source/libs/poppler/include/Makefile.am2
-rw-r--r--Build/source/libs/poppler/include/Makefile.in8
-rw-r--r--Build/source/libs/poppler/include/fofi/Makefile.am2
-rw-r--r--Build/source/libs/poppler/include/fofi/Makefile.in8
-rw-r--r--Build/source/libs/poppler/include/goo/Makefile.am2
-rw-r--r--Build/source/libs/poppler/include/goo/Makefile.in8
-rw-r--r--Build/source/libs/potrace/ChangeLog4
-rw-r--r--Build/source/libs/potrace/include/Makefile.am2
-rw-r--r--Build/source/libs/potrace/include/Makefile.in8
-rw-r--r--Build/source/libs/teckit/ChangeLog5
-rw-r--r--Build/source/libs/teckit/include/teckit/Makefile.am4
-rw-r--r--Build/source/libs/teckit/include/teckit/Makefile.in8
-rw-r--r--Build/source/libs/xpdf/ChangeLog5
-rw-r--r--Build/source/libs/xpdf/fofi/Makefile.am4
-rw-r--r--Build/source/libs/xpdf/fofi/Makefile.in8
-rw-r--r--Build/source/libs/xpdf/goo/Makefile.am4
-rw-r--r--Build/source/libs/xpdf/goo/Makefile.in8
-rw-r--r--Build/source/libs/xpdf/splash/Makefile.am4
-rw-r--r--Build/source/libs/xpdf/splash/Makefile.in8
-rw-r--r--Build/source/libs/xpdf/xpdf/Makefile.am4
-rw-r--r--Build/source/libs/xpdf/xpdf/Makefile.in8
-rw-r--r--Build/source/libs/zlib/ChangeLog8
-rw-r--r--Build/source/libs/zlib/Makefile.am17
-rw-r--r--Build/source/libs/zlib/Makefile.in42
-rw-r--r--Build/source/libs/zlib/include/Makefile.am4
-rw-r--r--Build/source/libs/zlib/include/Makefile.in8
-rw-r--r--Build/source/libs/zziplib/ChangeLog4
-rw-r--r--Build/source/libs/zziplib/include/zzip/Makefile.am4
-rw-r--r--Build/source/libs/zziplib/include/zzip/Makefile.in8
55 files changed, 248 insertions, 155 deletions
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/am/hdr_links.am b/Build/source/libs/am/hdr_links.am
deleted file mode 100644
index 74b429b2c7f..00000000000
--- a/Build/source/libs/am/hdr_links.am
+++ /dev/null
@@ -1,20 +0,0 @@
-## libs/am/hdr_links.am: Makefile fragment for header links.
-##
-## Copyright (C) 2012 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.
-all-local:
- @for file in $(hdr_links); do \
- test -f $$file || continue; \
- inst=`echo $$file | sed -e 's/^.*\///'`; \
- test -f $$inst || { \
- rm -f $$inst; \
- if $(AM_V_P); then echo "$(LN_S) $$file $$inst"; \
- else echo " INST $$inst"; fi; \
- $(LN_S) $$file $$inst; } || exit 1; \
- done
-
-distclean-local:
- rm -f *.h
-
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