diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 09:44:45 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 09:44:45 +0000 |
commit | b77e78eaf3652b80e78ae80f770bd3bdf721363d (patch) | |
tree | d3c67296e30534c63d02c5bb5e5790b1d9150cd0 /Build/source/libs/libpng/Makefile.am | |
parent | ad04e2284cbf8d1a4b268636c7451f89d29c4d0a (diff) |
new build system: mode texk/xdvik and general update
git-svn-id: svn://tug.org/texlive/trunk@12771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng/Makefile.am')
-rw-r--r-- | Build/source/libs/libpng/Makefile.am | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 09b99a10429..e6215891fa6 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -23,17 +23,9 @@ INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) AM_CPPFLAGS = $(LIBPNG_DEFINES) if build - noinst_LIBRARIES=libpng.a - -TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) - -check_PROGRAMS = pngtest -dist_check_SCRIPTS = libpng.test - endif build - -TESTS = libpng.test +EXTRA_LIBRARIES=libpng.a nodist_libpng_a_SOURCES = \ $(LIBPNG_TREE)/png.c \ @@ -52,11 +44,18 @@ nodist_libpng_a_SOURCES = \ $(LIBPNG_TREE)/pngerror.c \ $(LIBPNG_TREE)/pngpread.c -libpng_a_DEPENDENCIES = $(ZLIB_DEPEND) +$(libpng_a_OBJECTS): $(ZLIB_DEPEND) ## Rebuild zlib @ZLIB_RULE@ +if build +TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) +TESTS = libpng.test +check_PROGRAMS = pngtest +dist_check_SCRIPTS = libpng.test +endif build + CLEANFILES = pngout.png nodist_pngtest_SOURCES = $(LIBPNG_TREE)/pngtest.c |