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/libpng/Makefile.am | |
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/libpng/Makefile.am')
-rw-r--r-- | Build/source/libs/libpng/Makefile.am | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index be3ecfe7a24..3b07dfee01e 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -8,15 +8,8 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -# Rebuild -.PHONY: rebuild -rebuild: all - ## We want to re-distribute the whole original libpng 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 $(LIBPNG_TREE). EXTRA_DIST = $(LIBPNG_TREE) ## Patches applied to the original source tree @@ -60,15 +53,8 @@ nodist_libpng_a_SOURCES = \ $(libpng_a_OBJECTS): config.force -config.force: $(ZLIB_DEPEND) - echo timestamp >config.force - $(SHELL) ./config.status --recheck - -DISTCLEANFILES = config.force - -## Rebuild zlib -@ZLIB_RULE@ - +## Tests +## TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) if build TESTS = libpng.test @@ -81,3 +67,18 @@ CLEANFILES = pngout.png nodist_pngtest_SOURCES = @LIBPNG_TREE@/pngtest.c pngtest_LDADD = libpng.a $(ZLIB_LIBS) +## Rebuild zlib +@ZLIB_RULE@ + +# Reconfig +reconfig_prereq = $(ZLIB_DEPEND) +DISTCLEANFILES = + +include $(srcdir)/../../am/reconfig.am + +# Rebuild +rebuild_prereq = +rebuild_target = all + +include $(srcdir)/../../am/rebuild.am + |