summaryrefslogtreecommitdiff
path: root/Build/source/libs/cairo
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-06 09:40:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-06 09:40:06 +0000
commit832b5ce3848de5ca76c493570fc066f450ec8011 (patch)
tree52b629b6cd51b3769658ae55dc1f511c0bcac222 /Build/source/libs/cairo
parent7d7828afcc587d0e0889fb0a62cdfe25c53cb9d2 (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/cairo')
-rw-r--r--Build/source/libs/cairo/ChangeLog4
-rw-r--r--Build/source/libs/cairo/cairo/Makefile.am2
-rw-r--r--Build/source/libs/cairo/cairo/Makefile.in8
3 files changed, 9 insertions, 5 deletions
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog
index 2bece5835b3..6a3889d7dc0 100644
--- a/Build/source/libs/cairo/ChangeLog
+++ b/Build/source/libs/cairo/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * cairo/Makefile.am: Moved Makefile fragments to ../../am/.
+
2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (SUBDIRS): Build the library first.
diff --git a/Build/source/libs/cairo/cairo/Makefile.am b/Build/source/libs/cairo/cairo/Makefile.am
index 231687453bc..81b7e6ff456 100644
--- a/Build/source/libs/cairo/cairo/Makefile.am
+++ b/Build/source/libs/cairo/cairo/Makefile.am
@@ -15,5 +15,5 @@ hdr_links = \
$(CAIRO_BLD)/cairo-features.h \
$(CAIRO_SRC)/cairo-version.h
-include $(top_srcdir)/../am/hdr_links.am
+include $(top_srcdir)/../../am/hdr_links.am
diff --git a/Build/source/libs/cairo/cairo/Makefile.in b/Build/source/libs/cairo/cairo/Makefile.in
index 830a48878c1..67ba6e5b313 100644
--- a/Build/source/libs/cairo/cairo/Makefile.in
+++ b/Build/source/libs/cairo/cairo/Makefile.in
@@ -77,8 +77,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-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 = cairo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \
@@ -231,7 +231,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*) \
@@ -252,7 +252,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