diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-06 09:40:06 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-06 09:40:06 +0000 |
| commit | 832b5ce3848de5ca76c493570fc066f450ec8011 (patch) | |
| tree | 52b629b6cd51b3769658ae55dc1f511c0bcac222 /Build/source/libs/libpng | |
| parent | 7d7828afcc587d0e0889fb0a62cdfe25c53cb9d2 (diff) | |
build system: Move Makefile fragments from libs/am/ and texk/am/ to top-level/am.
git-svn-id: svn://tug.org/texlive/trunk@31117 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng')
| -rw-r--r-- | Build/source/libs/libpng/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/libpng/include/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/libs/libpng/include/Makefile.in | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 7802f3d4422..83677d2d471 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * include/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-29 Peter Breitenlohner <peb@mppmu.mpg.de> Import libpng-1.5.17. diff --git a/Build/source/libs/libpng/include/Makefile.am b/Build/source/libs/libpng/include/Makefile.am index 7d799db771c..35797c9eec0 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-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -13,5 +13,5 @@ hdr_links = \ $(LIBPNG_SRC)/pngconf.h \ $(LIBPNG_SRC)/pnglibconf.h -include $(top_srcdir)/../am/hdr_links.am +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 95e313d4b89..365cc457882 100644 --- a/Build/source/libs/libpng/include/Makefile.in +++ b/Build/source/libs/libpng/include/Makefile.in @@ -75,8 +75,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am +DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -216,7 +216,7 @@ hdr_links = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/hdr_links.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*) \ @@ -237,7 +237,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_srcdir)/../../am/hdr_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |