diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-06 09:40:06 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-06 09:40:06 +0000 |
| commit | 832b5ce3848de5ca76c493570fc066f450ec8011 (patch) | |
| tree | 52b629b6cd51b3769658ae55dc1f511c0bcac222 /Build/source/texk/tex4htk | |
| parent | 7d7828afcc587d0e0889fb0a62cdfe25c53cb9d2 (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/tex4htk')
| -rw-r--r-- | Build/source/texk/tex4htk/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/tex4htk/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/texk/tex4htk/Makefile.in | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index 1670bc8d3f3..d12864df2be 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de> * t4ht.c, tex4ht.c: Always include system headers after diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index e6d22850498..4f3095c2b03 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/tex4htk/ ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -33,7 +33,7 @@ shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex scriptsdir = texmf-dist/scripts/tex4ht nodist_bin_SCRIPTS = -include $(srcdir)/../am/script_links.am +include $(srcdir)/../../am/script_links.am texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 928baa6f37e..2d00d651e12 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -80,7 +80,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = t4ht$(EXEEXT) tex4ht$(EXEEXT) -DIST_COMMON = $(srcdir)/../am/script_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ $(am__dist_bin_SCRIPTS_DIST) $(dist_texmf_SCRIPTS) \ @@ -405,7 +405,7 @@ all: c-auto.h .SUFFIXES: .c .lo .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -428,7 +428,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/script_links.am: +$(srcdir)/../../am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck |