summaryrefslogtreecommitdiff
path: root/Build/source/libs/pixman
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-26 07:35:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-26 07:35:06 +0000
commitd0c3117e5c8cea5fe0d1a44f1e71e52238eda87e (patch)
tree037acf292d5408aa20359396e2c33cdc78c8ef15 /Build/source/libs/pixman
parenta9d413edd25d84283f1222cb1d2e1beba5ba1daa (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/pixman')
-rw-r--r--Build/source/libs/pixman/ChangeLog4
-rw-r--r--Build/source/libs/pixman/Makefile.am2
-rw-r--r--Build/source/libs/pixman/Makefile.in2
3 files changed, 6 insertions, 2 deletions
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 = \