summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler
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/poppler
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/poppler')
-rw-r--r--Build/source/libs/poppler/ChangeLog5
-rw-r--r--Build/source/libs/poppler/include/Makefile.am2
-rw-r--r--Build/source/libs/poppler/include/Makefile.in8
-rw-r--r--Build/source/libs/poppler/include/fofi/Makefile.am2
-rw-r--r--Build/source/libs/poppler/include/fofi/Makefile.in8
-rw-r--r--Build/source/libs/poppler/include/goo/Makefile.am2
-rw-r--r--Build/source/libs/poppler/include/goo/Makefile.in8
7 files changed, 20 insertions, 15 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index ade2f878ea8..9cd67d519d5 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * include/Makefile.am, include/{fofi,goo}/Makefile.am:
+ Moved Makefile fragments to ../../am/.
+
2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.23.3.
diff --git a/Build/source/libs/poppler/include/Makefile.am b/Build/source/libs/poppler/include/Makefile.am
index 017e65f42ce..c5026473e5a 100644
--- a/Build/source/libs/poppler/include/Makefile.am
+++ b/Build/source/libs/poppler/include/Makefile.am
@@ -10,5 +10,5 @@ SUBDIRS = goo fofi
hdr_links = $(top_srcdir)/$(POPPLER_TREE)/poppler/*.h ../poppler-config.h
-include $(top_srcdir)/../am/hdr_links.am
+include $(top_srcdir)/../../am/hdr_links.am
diff --git a/Build/source/libs/poppler/include/Makefile.in b/Build/source/libs/poppler/include/Makefile.in
index d5ff51ac9a3..eda83b1265a 100644
--- a/Build/source/libs/poppler/include/Makefile.in
+++ b/Build/source/libs/poppler/include/Makefile.in
@@ -75,8 +75,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-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 = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -278,7 +278,7 @@ hdr_links = $(top_srcdir)/$(POPPLER_TREE)/poppler/*.h ../poppler-config.h
all: all-recursive
.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*) \
@@ -299,7 +299,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
diff --git a/Build/source/libs/poppler/include/fofi/Makefile.am b/Build/source/libs/poppler/include/fofi/Makefile.am
index 21e306a25eb..6fa1c9b3412 100644
--- a/Build/source/libs/poppler/include/fofi/Makefile.am
+++ b/Build/source/libs/poppler/include/fofi/Makefile.am
@@ -8,5 +8,5 @@
##
hdr_links = $(top_srcdir)/$(POPPLER_TREE)/fofi/*.h
-include $(top_srcdir)/../am/hdr_links.am
+include $(top_srcdir)/../../am/hdr_links.am
diff --git a/Build/source/libs/poppler/include/fofi/Makefile.in b/Build/source/libs/poppler/include/fofi/Makefile.in
index 0b985916ad2..bd19bcf8a7e 100644
--- a/Build/source/libs/poppler/include/fofi/Makefile.in
+++ b/Build/source/libs/poppler/include/fofi/Makefile.in
@@ -75,8 +75,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-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 = include/fofi
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -217,7 +217,7 @@ hdr_links = $(top_srcdir)/$(POPPLER_TREE)/fofi/*.h
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*) \
@@ -238,7 +238,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
diff --git a/Build/source/libs/poppler/include/goo/Makefile.am b/Build/source/libs/poppler/include/goo/Makefile.am
index 50704c5b01a..41f9e3a00c6 100644
--- a/Build/source/libs/poppler/include/goo/Makefile.am
+++ b/Build/source/libs/poppler/include/goo/Makefile.am
@@ -8,5 +8,5 @@
##
hdr_links = $(top_srcdir)/$(POPPLER_TREE)/goo/*.h
-include $(top_srcdir)/../am/hdr_links.am
+include $(top_srcdir)/../../am/hdr_links.am
diff --git a/Build/source/libs/poppler/include/goo/Makefile.in b/Build/source/libs/poppler/include/goo/Makefile.in
index 1cbff0ed0c8..ac629b3bca8 100644
--- a/Build/source/libs/poppler/include/goo/Makefile.in
+++ b/Build/source/libs/poppler/include/goo/Makefile.in
@@ -75,8 +75,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-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 = include/goo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -217,7 +217,7 @@ hdr_links = $(top_srcdir)/$(POPPLER_TREE)/goo/*.h
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*) \
@@ -238,7 +238,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