summaryrefslogtreecommitdiff
path: root/Build/source/texk/cjkutils
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/texk/cjkutils
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/texk/cjkutils')
-rw-r--r--Build/source/texk/cjkutils/ChangeLog4
-rw-r--r--Build/source/texk/cjkutils/Makefile.am2
-rw-r--r--Build/source/texk/cjkutils/Makefile.in6
3 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog
index 2332196ce83..8897ee493b0 100644
--- a/Build/source/texk/cjkutils/ChangeLog
+++ b/Build/source/texk/cjkutils/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Moved Makefile fragments to ../../am/.
+
2013-02-08 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (hbf2gf_cfgdir): Change texmf => texmf-dist.
diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am
index e6dc65de597..4ef526b7e55 100644
--- a/Build/source/texk/cjkutils/Makefile.am
+++ b/Build/source/texk/cjkutils/Makefile.am
@@ -64,7 +64,7 @@ else !WIN32
bin_links = gbklatex:bg5+latex gbkpdflatex:bg5+pdflatex
endif !WIN32
-include $(srcdir)/../am/bin_links.am
+include $(srcdir)/../../am/bin_links.am
gbklatex_SOURCES = \
@CJKUTILS_TREE@/cjklatex/cjklatex.c
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index 6a3338ca6d8..3120d986612 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -87,7 +87,7 @@ bin_PROGRAMS = bg5conv$(EXEEXT) cefconv$(EXEEXT) cef5conv$(EXEEXT) \
@WIN32_TRUE@ gbklatex \
@WIN32_TRUE@ gbkpdflatex
-DIST_COMMON = $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/../../am/bin_links.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/c-auto.in \
$(top_srcdir)/../../build-aux/depcomp \
@@ -662,7 +662,7 @@ all: c-auto.h
.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -685,7 +685,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../am/bin_links.am:
+$(srcdir)/../../am/bin_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck