summaryrefslogtreecommitdiff
path: root/Build/source/libs/libpng
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-24 08:05:21 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-24 08:05:21 +0000
commite75c1ca802e8338ab6601788163bec9bb0591128 (patch)
tree0c82c700aca33a171763c921c9b5eac4d369eb01 /Build/source/libs/libpng
parent6c7a45745172cf952ad650c99af32f22411cd454 (diff)
build system: New Makefile fragment to `install' headers in the build tree.
git-svn-id: svn://tug.org/texlive/trunk@25493 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng')
-rw-r--r--Build/source/libs/libpng/ChangeLog4
-rw-r--r--Build/source/libs/libpng/include/Makefile.am16
-rw-r--r--Build/source/libs/libpng/include/Makefile.in12
3 files changed, 14 insertions, 18 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog
index fa18072a509..9988ba57db6 100644
--- a/Build/source/libs/libpng/ChangeLog
+++ b/Build/source/libs/libpng/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * include/Makefile.am: Use ../am/hdr_links.am.
+
2012-02-23 Peter Breitenlohner <peb@mppmu.mpg.de>
Import libpng-1.5.9.
diff --git a/Build/source/libs/libpng/include/Makefile.am b/Build/source/libs/libpng/include/Makefile.am
index 0c361096ecc..7d799db771c 100644
--- a/Build/source/libs/libpng/include/Makefile.am
+++ b/Build/source/libs/libpng/include/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to install libpng headers for TeX Live.
##
-## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -8,20 +8,10 @@
##
LIBPNG_SRC = $(top_srcdir)/$(LIBPNG_TREE)
-LIBPNG_HDRS = \
+hdr_links = \
$(LIBPNG_SRC)/png.h \
$(LIBPNG_SRC)/pngconf.h \
$(LIBPNG_SRC)/pnglibconf.h
-all-local:
- @for file in $(LIBPNG_HDRS); do \
- test -f $$file || continue; \
- inst=`echo $$file | sed -e 's/^.*\///'`; \
- test -f $$inst || { \
- echo "$(LN_S) $$file $$inst"; \
- $(LN_S) $$file $$inst; } || exit 1; \
- done
-
-distclean-local:
- rm -f *.h
+include $(top_srcdir)/../am/hdr_links.am
diff --git a/Build/source/libs/libpng/include/Makefile.in b/Build/source/libs/libpng/include/Makefile.in
index b9862c29f9e..99a31be0fb8 100644
--- a/Build/source/libs/libpng/include/Makefile.in
+++ b/Build/source/libs/libpng/include/Makefile.in
@@ -31,8 +31,9 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/../am/hdr_links.am
subdir = include
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -144,7 +145,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
LIBPNG_SRC = $(top_srcdir)/$(LIBPNG_TREE)
-LIBPNG_HDRS = \
+hdr_links = \
$(LIBPNG_SRC)/png.h \
$(LIBPNG_SRC)/pngconf.h \
$(LIBPNG_SRC)/pnglibconf.h
@@ -152,7 +153,7 @@ LIBPNG_HDRS = \
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -173,6 +174,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/../am/hdr_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,12 +334,12 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am
-
all-local:
- @for file in $(LIBPNG_HDRS); do \
+ @for file in $(hdr_links); do \
test -f $$file || continue; \
inst=`echo $$file | sed -e 's/^.*\///'`; \
test -f $$inst || { \
+ rm -f $$inst; \
echo "$(LN_S) $$file $$inst"; \
$(LN_S) $$file $$inst; } || exit 1; \
done