diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-26 07:35:06 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-26 07:35:06 +0000 |
commit | d0c3117e5c8cea5fe0d1a44f1e71e52238eda87e (patch) | |
tree | 037acf292d5408aa20359396e2c33cdc78c8ef15 /Build/source/libs/libpng | |
parent | a9d413edd25d84283f1222cb1d2e1beba5ba1daa (diff) |
build system: Fix dependencies for build `on demand'
git-svn-id: svn://tug.org/texlive/trunk@30950 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/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.in | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 6d759e55876..3cf82cc71e3 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (SUBDIRS): Build the library first. + 2013-06-06 Peter Breitenlohner <peb@mppmu.mpg.de> Import libpng-1.5.16 (downgrade). diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 78fb0a80180..be3ecfe7a24 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -34,7 +34,7 @@ dist-hook: $(distdir)/$(LIBPNG_TREE)/missing \ $(distdir)/$(LIBPNG_TREE)/mkinstalldirs -SUBDIRS = include +SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index 94e8b91797a..fe3f5bec838 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -548,7 +548,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES -SUBDIRS = include +SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libpng.a |