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 | |
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')
-rw-r--r-- | Build/source/libs/cairo/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/libs/cairo/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/cairo/Makefile.in | 2 | ||||
-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 | ||||
-rw-r--r-- | Build/source/libs/pixman/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/pixman/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/pixman/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/libs/teckit/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/teckit/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/teckit/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/libs/xpdf/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/xpdf/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/xpdf/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/libs/zziplib/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.in | 2 |
21 files changed, 47 insertions, 15 deletions
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog index 1122bab5fab..2bece5835b3 100644 --- a/Build/source/libs/cairo/ChangeLog +++ b/Build/source/libs/cairo/ChangeLog @@ -1,6 +1,10 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (SUBDIRS): Build the library first. + 2013-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> - Import cairo-1.12.8. + Import cairo-1.12.14. * Makefile.am, version.ac: Adapted. 2013-03-29 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/libs/cairo/Makefile.am b/Build/source/libs/cairo/Makefile.am index 9258bf01761..e392d62b1dd 100644 --- a/Build/source/libs/cairo/Makefile.am +++ b/Build/source/libs/cairo/Makefile.am @@ -27,7 +27,7 @@ CAIRO_SRC = $(CAIRO_TREE)/src dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.lo' -o -name '*.$(OBJEXT)'` -SUBDIRS = cairo +SUBDIRS = . cairo AM_CPPFLAGS = -I$(top_srcdir)/$(CAIRO_SRC) $(PIXMAN_INCLUDES) -DCAIRO_NO_MUTEX AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in index 3350339e84c..f7eeb5c104d 100644 --- a/Build/source/libs/cairo/Makefile.in +++ b/Build/source/libs/cairo/Makefile.in @@ -905,7 +905,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 EXTRA_DIST = $(CAIRO_TREE) $(CAIRO_TREE)-PATCHES CAIRO_SRC = $(CAIRO_TREE)/src -SUBDIRS = cairo +SUBDIRS = . cairo AM_CPPFLAGS = -I$(top_srcdir)/$(CAIRO_SRC) $(PIXMAN_INCLUDES) -DCAIRO_NO_MUTEX AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) noinst_LIBRARIES = libcairo.a 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 diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog index d3f55514a65..3369a2670c0 100644 --- a/Build/source/libs/pixman/ChangeLog +++ b/Build/source/libs/pixman/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (SUBDIRS): Build the library first. + 2013-05-30 Peter Breitenlohner <peb@mppmu.mpg.de> Import pixman-0.30.0. diff --git a/Build/source/libs/pixman/Makefile.am b/Build/source/libs/pixman/Makefile.am index 1d7cd0f2153..01bda177d82 100644 --- a/Build/source/libs/pixman/Makefile.am +++ b/Build/source/libs/pixman/Makefile.am @@ -27,7 +27,7 @@ dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` rm -f $(distdir)/$(PIXMAN_SRC)/pixman-version.h -SUBDIRS = include +SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(PIXMAN_SRC) diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in index 21ff1119a29..2d71bdb5734 100644 --- a/Build/source/libs/pixman/Makefile.in +++ b/Build/source/libs/pixman/Makefile.in @@ -572,7 +572,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(PIXMAN_TREE) $(PIXMAN_TREE)-PATCHES PIXMAN_SRC = $(PIXMAN_TREE)/pixman -SUBDIRS = include +SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(PIXMAN_SRC) noinst_LIBRARIES = libpixman.a libpixman_sources = \ diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index 534aba77bd6..8434c4dc21b 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Ensure existence of zlib headers. + 2013-06-18 Peter Breitenlohner <peb@mppmu.mpg.de> Import poppler-0.23.2. diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am index db9615959b1..f5aae6c7bcd 100644 --- a/Build/source/libs/poppler/Makefile.am +++ b/Build/source/libs/poppler/Makefile.am @@ -37,6 +37,8 @@ AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) noinst_LIBRARIES = libpoppler.a +$(libpoppler_a_OBJECTS): $(ZLIB_DEPEND) + nodist_libpoppler_a_SOURCES = \ $(goo_libGoo_a_sources) \ $(fofi_libfofi_a_sources) \ diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index c5b05c9aa17..6f62219de2d 100644 --- a/Build/source/libs/poppler/Makefile.in +++ b/Build/source/libs/poppler/Makefile.in @@ -1375,6 +1375,8 @@ rebuild: all dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` +$(libpoppler_a_OBJECTS): $(ZLIB_DEPEND) + $(libpoppler_a_OBJECTS): config.force config.force: $(ZLIB_DEPEND) diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index 58f0c2b4390..af218ab1170 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (SUBDIRS): Build the library first. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index 722d79878fa..614c0b33234 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST += $(TECKIT_TREE)-PATCHES dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` -SUBDIRS = include/teckit +SUBDIRS = . include/teckit AM_CPPFLAGS = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) AM_CPPFLAGS += -DNDEBUG diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 4765fea1abb..4349585e8bc 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -566,7 +566,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(TECKIT_TREE) $(TECKIT_TREE)-PATCHES teckit.test \ tex-text.map tex-text.tec -SUBDIRS = include/teckit +SUBDIRS = . include/teckit AM_CPPFLAGS = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers \ $(ZLIB_INCLUDES) -DNDEBUG AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index 30b85bda7d2..977476df01e 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (SUBDIRS): Build the library first. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index a16c66a4128..7493d0506ce 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -44,7 +44,7 @@ dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` rm -f $(distdir)/$(XPDF_TREE)/install-sh -SUBDIRS = goo fofi splash xpdf +SUBDIRS = . goo fofi splash xpdf GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi @@ -52,7 +52,7 @@ SPLASH_SRC = $(top_srcdir)/$(XPDF_TREE)/splash XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf AM_CPPFLAGS = -Igoo -Ifofi -Isplash -Ixpdf -AM_CPPFLAGS += -I$(FOFI_SRC) -I$(SPLASH_SRC) -I$(XPDF_SRC) +AM_CPPFLAGS += -I$(GOO_SRC) -I$(FOFI_SRC) -I$(SPLASH_SRC) -I$(XPDF_SRC) AM_CPPFLAGS += -DPDF_PARSER_ONLY AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index c713557e5d4..00754559864 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -378,12 +378,12 @@ top_srcdir = @top_srcdir@ #======================================================================== ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(XPDF_TREE) $(XPDF_TREE)-foolabs $(XPDF_TREE)-PATCHES -SUBDIRS = goo fofi splash xpdf +SUBDIRS = . goo fofi splash xpdf GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi SPLASH_SRC = $(top_srcdir)/$(XPDF_TREE)/splash XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf -AM_CPPFLAGS = -Igoo -Ifofi -Isplash -Ixpdf -I$(FOFI_SRC) \ +AM_CPPFLAGS = -Igoo -Ifofi -Isplash -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) \ -I$(SPLASH_SRC) -I$(XPDF_SRC) -DPDF_PARSER_ONLY AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index c012bcec819..488c0d1fa20 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (SUBDIRS): Build the library first. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 48da0a23854..52039a0d987 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -31,7 +31,7 @@ dist-hook: $(distdir)/$(ZZIPLIB_TREE)/zzip/_config.h \ $(distdir)/$(ZZIPLIB_TREE)/zzip/_msvc.h -SUBDIRS = include/zzip +SUBDIRS = . include/zzip AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) AM_CPPFLAGS += $(ZZIPLIB_DEFINES) diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index 5f9b39e77c6..81a92201f5d 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -558,7 +558,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES -SUBDIRS = include/zzip +SUBDIRS = . include/zzip AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \ $(ZLIB_INCLUDES) $(ZZIPLIB_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) |