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 /Build/source/libs/zlib | |
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
Diffstat (limited to 'Build/source/libs/zlib')
-rw-r--r-- | Build/source/libs/zlib/ChangeLog | 8 | ||||
-rw-r--r-- | Build/source/libs/zlib/Makefile.am | 17 | ||||
-rw-r--r-- | Build/source/libs/zlib/Makefile.in | 42 | ||||
-rw-r--r-- | Build/source/libs/zlib/include/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/include/Makefile.in | 8 |
5 files changed, 54 insertions, 25 deletions
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 |