diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-07 14:29:53 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-07 14:29:53 +0000 |
commit | 0df6dd4d8aea6edc733de81fb7eec115ea59a36e (patch) | |
tree | e2f7056cb53c58c8ef5779450ac468091b2bd86d /Build/source/libs/poppler | |
parent | 3675a91dd83af3eaa1c1a12e91af1e6c86f710f8 (diff) |
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
Diffstat (limited to 'Build/source/libs/poppler')
-rw-r--r-- | Build/source/libs/poppler/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/Makefile.am | 23 | ||||
-rw-r--r-- | Build/source/libs/poppler/Makefile.in | 62 |
3 files changed, 66 insertions, 23 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index 9cd67d519d5..5d46485a227 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,7 @@ +2012-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am. + 2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> * include/Makefile.am, include/{fofi,goo}/Makefile.am: diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am index f5aae6c7bcd..e2fb830c3b1 100644 --- a/Build/source/libs/poppler/Makefile.am +++ b/Build/source/libs/poppler/Makefile.am @@ -8,10 +8,6 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -# Rebuild -.PHONY: rebuild -rebuild: all - ## We want to re-distribute the whole original poppler source tree. ## EXTRA_DIST = $(POPPLER_TREE) @@ -127,12 +123,19 @@ poppler_libpoppler_a_sources = \ $(libpoppler_a_OBJECTS): config.force -config.force: $(ZLIB_DEPEND) - echo timestamp >config.force - $(SHELL) ./config.status --recheck - -DISTCLEANFILES = config.force - ## Rebuild zlib @ZLIB_RULE@ +# Reconfig +reconfig_prereq = $(ZLIB_DEPEND) +DISTCLEANFILES = + +include $(srcdir)/../../am/reconfig.am + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = + +include $(srcdir)/../../am/rebuild.am + diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index b6135a38875..04398daabb3 100644 --- a/Build/source/libs/poppler/Makefile.in +++ b/Build/source/libs/poppler/Makefile.in @@ -76,10 +76,10 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in \ +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 \ $(top_srcdir)/poppler-0.23.3/poppler/poppler-config.h.in \ $(top_srcdir)/../../build-aux/depcomp ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ @@ -90,6 +90,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-warnings.m4 \ @@ -506,7 +507,15 @@ poppler_libpoppler_a_sources = \ @POPPLER_TREE@/poppler/XpdfPluginAPI.cc \ @POPPLER_TREE@/poppler/strtok_r.cpp + +# Reconfig +reconfig_prereq = $(ZLIB_DEPEND) DISTCLEANFILES = config.force + +# Rebuild +rebuild_prereq = +rebuild_target = all +CLEANFILES = rebuild.stamp all: config.h poppler-config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -514,7 +523,7 @@ all: config.h poppler-config.h .SUFFIXES: .cc .cpp .o .obj 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*) \ @@ -537,6 +546,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 @@ -1260,6 +1270,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -1367,10 +1378,6 @@ uninstall-am: 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)'` @@ -1379,11 +1386,40 @@ $(libpoppler_a_OBJECTS): $(ZLIB_DEPEND) $(libpoppler_a_OBJECTS): config.force -config.force: $(ZLIB_DEPEND) - echo timestamp >config.force - $(SHELL) ./config.status --recheck - @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 >$@ + +.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. |