summaryrefslogtreecommitdiff
path: root/Build/source/texk/dviljk
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/dviljk
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/dviljk')
-rw-r--r--Build/source/texk/dviljk/ChangeLog4
-rw-r--r--Build/source/texk/dviljk/Makefile.am4
-rw-r--r--Build/source/texk/dviljk/Makefile.in8
3 files changed, 10 insertions, 6 deletions
diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog
index beee994cbb6..b9a2f8af8e3 100644
--- a/Build/source/texk/dviljk/ChangeLog
+++ b/Build/source/texk/dviljk/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Moved Makefile fragments to ../../am/.
+
2013-03-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvi2xx.c: use '(void)AssureBinary' to avoid compiler warning.
diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am
index dbe2dd619d7..03adfa73e44 100644
--- a/Build/source/texk/dviljk/Makefile.am
+++ b/Build/source/texk/dviljk/Makefile.am
@@ -58,7 +58,7 @@ dvilj6_LDADD =
bin_links = dvilj4$(EXEEXT):dvilj6
-include $(top_srcdir)/../am/bin_links.am
+include $(top_srcdir)/../../am/bin_links.am
dist_man1_MANS = dvihp.man dvilj.man
@@ -68,7 +68,7 @@ man1_links = \
dvilj:dvilj4l \
dvilj:dvilj6
-include $(top_srcdir)/../am/man1_links.am
+include $(top_srcdir)/../../am/man1_links.am
install-exec-hook: install-bin-links
diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in
index 836d253d10b..951bf49c698 100644
--- a/Build/source/texk/dviljk/Makefile.in
+++ b/Build/source/texk/dviljk/Makefile.in
@@ -83,8 +83,8 @@ host_triplet = @host@
bin_PROGRAMS = dvilj$(EXEEXT) dvilj2p$(EXEEXT) dvilj4$(EXEEXT) \
dvilj4l$(EXEEXT) $(am__EXEEXT_1)
@WIN32_TRUE@am__append_1 = dvilj6
-DIST_COMMON = $(top_srcdir)/../am/bin_links.am \
- $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
+ $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/c-auto.in \
$(top_srcdir)/../texlive/w32_wrapper/callexe.c \
@@ -483,7 +483,7 @@ all: c-auto.h
.SUFFIXES: .c .lo .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -506,7 +506,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;
-$(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am:
+$(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck