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/cairo | |
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/cairo')
-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 |
3 files changed, 7 insertions, 3 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 |