summaryrefslogtreecommitdiff
path: root/Build/source/libs/libpng
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-21 09:44:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-21 09:44:45 +0000
commitb77e78eaf3652b80e78ae80f770bd3bdf721363d (patch)
treed3c67296e30534c63d02c5bb5e5790b1d9150cd0 /Build/source/libs/libpng
parentad04e2284cbf8d1a4b268636c7451f89d29c4d0a (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')
-rw-r--r--Build/source/libs/libpng/Makefile.am19
-rw-r--r--Build/source/libs/libpng/Makefile.in10
-rw-r--r--Build/source/libs/libpng/ac/libpng.ac6
-rw-r--r--Build/source/libs/libpng/ac/withenable.ac6
4 files changed, 25 insertions, 16 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
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index 02eb5931b66..ed8d3e441a4 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -194,9 +194,7 @@ EXTRA_DIST = $(LIBPNG_TREE)
INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES)
AM_CPPFLAGS = $(LIBPNG_DEFINES)
@build_TRUE@noinst_LIBRARIES = libpng.a
-@build_TRUE@TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
-@build_TRUE@dist_check_SCRIPTS = libpng.test
-TESTS = libpng.test
+EXTRA_LIBRARIES = libpng.a
nodist_libpng_a_SOURCES = \
$(LIBPNG_TREE)/png.c \
$(LIBPNG_TREE)/pngset.c \
@@ -214,7 +212,9 @@ nodist_libpng_a_SOURCES = \
$(LIBPNG_TREE)/pngerror.c \
$(LIBPNG_TREE)/pngpread.c
-libpng_a_DEPENDENCIES = $(ZLIB_DEPEND)
+@build_TRUE@TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
+@build_TRUE@TESTS = libpng.test
+@build_TRUE@dist_check_SCRIPTS = libpng.test
CLEANFILES = pngout.png
nodist_pngtest_SOURCES = $(LIBPNG_TREE)/pngtest.c
pngtest_LDADD = libpng.a $(ZLIB_LIBS)
@@ -930,6 +930,8 @@ uninstall-am:
dist-hook:
rm -rf `find $(distdir)/$(LIBPNG_TREE) -name .svn`
+$(libpng_a_OBJECTS): $(ZLIB_DEPEND)
+
@ZLIB_RULE@
# 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.
diff --git a/Build/source/libs/libpng/ac/libpng.ac b/Build/source/libs/libpng/ac/libpng.ac
index 009eb29cd33..fcf51aadf7c 100644
--- a/Build/source/libs/libpng/ac/libpng.ac
+++ b/Build/source/libs/libpng/ac/libpng.ac
@@ -1,3 +1,7 @@
-## libs/libpng/ac/libpng.ac
+## libs/libpng/ac/libpng.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
## define required functions and headers from system libpng
KPSE_CHECK_LIB([libpng], [png_set_read_fn], [png.h])
diff --git a/Build/source/libs/libpng/ac/withenable.ac b/Build/source/libs/libpng/ac/withenable.ac
index 37489800b6c..bd585135b96 100644
--- a/Build/source/libs/libpng/ac/withenable.ac
+++ b/Build/source/libs/libpng/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/libpng/kpse/withenable.ac
+## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
## configure options and TL libraries required for libpng
KPSE_WITH_LIB([libpng], [zlib])