diff options
Diffstat (limited to 'Build/source/libs/teckit')
| -rw-r--r-- | Build/source/libs/teckit/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/teckit/Makefile.am | 30 | ||||
| -rw-r--r-- | Build/source/libs/teckit/Makefile.in | 65 |
3 files changed, 69 insertions, 30 deletions
diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index c2ca6e769a1..2f1855ede79 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/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/teckit/Makefile.am: diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index 614c0b33234..a1935bcce03 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -5,15 +5,8 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -# Rebuild -.PHONY: rebuild -rebuild: all - ## We want to re-distribute the whole original TECkit 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 $(TECKIT_TREE). EXTRA_DIST = $(TECKIT_TREE) ## Patches applied to the original source tree @@ -55,14 +48,7 @@ nodist_libTECkit_a_SOURCES = \ $(libTECkit_Compiler_a_OBJECTS) $(libTECkit_a_OBJECTS): config.force -config.force: $(ZLIB_DEPEND) - echo timestamp >config.force - $(SHELL) ./config.status --recheck - -DISTCLEANFILES = config.force CXXLD.sh - -## Rebuild zlib -@ZLIB_RULE@ +DISTCLEANFILES = CXXLD.sh ## Tests ## @@ -79,3 +65,17 @@ EXTRA_DIST += \ ## CLEANFILES = xtex-text.tec +## Rebuild zlib +@ZLIB_RULE@ + +# Reconfig +reconfig_prereq = $(ZLIB_DEPEND) + +include $(srcdir)/../../am/reconfig.am + +# Rebuild +rebuild_prereq = +rebuild_target = all + +include $(srcdir)/../../am/rebuild.am + diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 4349585e8bc..df25d0e5fbd 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -80,10 +80,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = teckit_compile$(EXEEXT) -subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/depcomp \ +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)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ @@ -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/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ @@ -589,9 +591,16 @@ nodist_libTECkit_Compiler_a_SOURCES = \ nodist_libTECkit_a_SOURCES = \ @TECKIT_TREE@/source/Engine.cpp -DISTCLEANFILES = config.force CXXLD.sh +DISTCLEANFILES = CXXLD.sh config.force @build_TRUE@TESTS = teckit.test -CLEANFILES = xtex-text.tec +CLEANFILES = xtex-text.tec rebuild.stamp + +# Reconfig +reconfig_prereq = $(ZLIB_DEPEND) + +# Rebuild +rebuild_prereq = +rebuild_target = all all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -599,7 +608,7 @@ all: config.h .SUFFIXES: .cpp .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*) \ @@ -622,6 +631,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 @@ -1353,10 +1363,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall uninstall-am uninstall-binPROGRAMS -# 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)'` @@ -1365,11 +1371,40 @@ $(teckit_compile_OBJECTS): libTECkit_Compiler.a $(libTECkit_Compiler_a_OBJECTS) $(libTECkit_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. |