From 0df6dd4d8aea6edc733de81fb7eec115ea59a36e Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sun, 7 Jul 2013 14:29:53 +0000 Subject: build system: additional Makefile fragments better handling of dependencies for highly parallel make git-svn-id: svn://tug.org/texlive/trunk@31127 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/zziplib/ChangeLog | 4 +++ Build/source/libs/zziplib/Makefile.am | 31 ++++++++-------- Build/source/libs/zziplib/Makefile.in | 67 +++++++++++++++++++++++++++-------- 3 files changed, 72 insertions(+), 30 deletions(-) (limited to 'Build/source/libs/zziplib') diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index 181ce169459..b0597623504 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,7 @@ +2012-07-06 Peter Breitenlohner + + * Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am. + 2013-07-05 Peter Breitenlohner * include/Makefile.am: Moved Makefile fragments to ../../am/. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 52039a0d987..58cabc0dab9 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -8,15 +8,8 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -# Rebuild -.PHONY: rebuild -rebuild: all - ## We want to re-distribute the whole original zziplib 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 $(ZZIPLIB_TREE). EXTRA_DIST = $(ZZIPLIB_TREE) ## Patches applied to the original source tree @@ -52,14 +45,7 @@ nodist_libzzip_a_SOURCES = \ $(libzzip_a_OBJECTS): config.force -config.force: $(ZLIB_DEPEND) - echo timestamp >config.force - $(SHELL) ./config.status --recheck - -DISTCLEANFILES = config.force include/_msvc.in _configs.sed - -## Rebuild zlib -@ZLIB_RULE@ +DISTCLEANFILES = include/_msvc.in _configs.sed TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE) if build @@ -74,3 +60,18 @@ distclean-local: nodist_unzzip_SOURCES = @ZZIPLIB_TREE@/bins/unzzip.c unzzip_LDADD = libzzip.a $(ZLIB_LIBS) +## Rebuild zlib +@ZLIB_RULE@ + +# Reconfig +reconfig_prereq = $(ZLIB_DEPEND) + +include $(srcdir)/../../am/reconfig.am + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = + +include $(srcdir)/../../am/rebuild.am + diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index 81a92201f5d..76bea30d009 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -79,10 +79,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @build_TRUE@check_PROGRAMS = unzzip$(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/reconfig.am \ + $(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 \ @@ -95,6 +96,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/../../build-aux/config.sub \ $(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/ac_sys_largefile_sensitive.m4 \ $(top_srcdir)/m4/ax_prefix_config_h.m4 \ @@ -574,12 +576,20 @@ nodist_libzzip_a_SOURCES = \ @ZZIPLIB_TREE@/zzip/write.c \ @ZZIPLIB_TREE@/zzip/zip.c -DISTCLEANFILES = config.force include/_msvc.in _configs.sed +DISTCLEANFILES = include/_msvc.in _configs.sed config.force TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE) @build_TRUE@TESTS = zziplib.test @build_TRUE@dist_check_SCRIPTS = zziplib.test nodist_unzzip_SOURCES = @ZZIPLIB_TREE@/bins/unzzip.c unzzip_LDADD = libzzip.a $(ZLIB_LIBS) + +# Reconfig +reconfig_prereq = $(ZLIB_DEPEND) + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = rebuild.stamp all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -587,7 +597,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -610,6 +620,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/reconfig.am $(srcdir)/../../am/rebuild.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1212,6 +1223,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) @@ -1319,10 +1331,6 @@ uninstall-am: ps ps-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)'` \ @@ -1333,14 +1341,43 @@ dist-hook: $(libzzip_a_OBJECTS): config.force -config.force: $(ZLIB_DEPEND) - echo timestamp >config.force - $(SHELL) ./config.status --recheck +distclean-local: + rm -rf test @ZLIB_RULE@ +config.force: $(reconfig_prereq) + @if test -f $@; then :; else \ + trap 'rm -rf reconfig.lock' 1 2 13 15; \ + if mkdir reconfig.lock 2>/dev/null; then \ + echo timestamp >$@; \ + $(SHELL) ./config.status --recheck; \ + rmdir reconfig.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + test -f $@; \ + fi; \ + fi +rebuild.stamp: + echo timestamp >$@ -distclean-local: - rm -rf test +.PHONY: rebuild +rebuild: $(rebuild_prereq) + @dry=; for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=*|--*);; \ + *n*) dry=:;; \ + esac; \ + done; \ + if test -f rebuild.stamp; then :; else \ + $$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; \ + $$dry test -f rebuild.stamp; exit $$?; \ + fi; \ + fi # 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. -- cgit v1.2.3