From 832b5ce3848de5ca76c493570fc066f450ec8011 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 6 Jul 2013 09:40:06 +0000 Subject: 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 --- Build/source/texk/ChangeLog | 4 ++ Build/source/texk/am/bin_links.am | 35 ---------- Build/source/texk/am/man.am | 52 -------------- Build/source/texk/am/man1_links.am | 25 ------- Build/source/texk/am/script_links.am | 87 ------------------------ Build/source/texk/chktex/ChangeLog | 4 ++ Build/source/texk/chktex/Makefile.am | 2 +- Build/source/texk/chktex/Makefile.in | 12 ++-- Build/source/texk/cjkutils/ChangeLog | 4 ++ Build/source/texk/cjkutils/Makefile.am | 2 +- Build/source/texk/cjkutils/Makefile.in | 6 +- Build/source/texk/dviljk/ChangeLog | 4 ++ Build/source/texk/dviljk/Makefile.am | 4 +- Build/source/texk/dviljk/Makefile.in | 8 +-- Build/source/texk/dvipdfm-x/ChangeLog | 2 + Build/source/texk/dvipdfm-x/Makefile.am | 4 +- Build/source/texk/dvipdfm-x/Makefile.in | 8 +-- Build/source/texk/dvipng/ChangeLog | 10 +++ Build/source/texk/dvipng/Makefile.am | 4 +- Build/source/texk/dvipng/Makefile.in | 8 +-- Build/source/texk/dvipng/doc/Makefile.am | 2 +- Build/source/texk/dvipng/doc/Makefile.in | 12 ++-- Build/source/texk/dvipng/dvipng.test | 6 +- Build/source/texk/kpathsea/ChangeLog | 5 ++ Build/source/texk/kpathsea/Makefile.am | 2 +- Build/source/texk/kpathsea/Makefile.in | 21 +++--- Build/source/texk/kpathsea/man/Makefile.am | 6 +- Build/source/texk/kpathsea/man/Makefile.in | 8 +-- Build/source/texk/tex4htk/ChangeLog | 4 ++ Build/source/texk/tex4htk/Makefile.am | 4 +- Build/source/texk/tex4htk/Makefile.in | 6 +- Build/source/texk/texlive/ChangeLog | 4 ++ Build/source/texk/texlive/tl_scripts/Makefile.am | 6 +- Build/source/texk/texlive/tl_scripts/Makefile.in | 10 +-- Build/source/texk/web2c/ChangeLog | 5 ++ Build/source/texk/web2c/Makefile.am | 2 +- Build/source/texk/web2c/Makefile.in | 6 +- Build/source/texk/web2c/man/Makefile.am | 6 +- Build/source/texk/web2c/man/Makefile.in | 8 +-- Build/source/texk/web2c/omegafonts/Makefile.am | 2 +- Build/source/texk/web2c/omegafonts/Makefile.in | 10 +-- 41 files changed, 136 insertions(+), 284 deletions(-) delete mode 100644 Build/source/texk/am/bin_links.am delete mode 100644 Build/source/texk/am/man.am delete mode 100644 Build/source/texk/am/man1_links.am delete mode 100644 Build/source/texk/am/script_links.am (limited to 'Build/source/texk') diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index b36562f1cf2..66698ad2764 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,7 @@ +2013-07-06 Peter Breitenlohner + + * am/*.am: Removed Makefile fragment to ../am/. + 2013-03-19 Peter Breitenlohner Merge bibtex8/ and bibtexu/ into bibtex-x/. diff --git a/Build/source/texk/am/bin_links.am b/Build/source/texk/am/bin_links.am deleted file mode 100644 index 69d01013e8a..00000000000 --- a/Build/source/texk/am/bin_links.am +++ /dev/null @@ -1,35 +0,0 @@ -## texk/am/bin_links.am: Makefile fragment for bindir links. -## -## Copyright (C) 2011 Peter Breitenlohner -## You may freely use, modify and/or distribute this file. -## -## requires conditional WIN32 -## requires $(bin_links) -## Symlinks within $(bindir): FILE:LINK indicates LINK->FILE -## for binaries and scripts use, e.g., -## binprog$(EXEEXT):foo -## script:bar -## respectively, such that the links created on cygwin are -## 'foo->binprog.exe' and 'bar->script'. -.PHONY: install-bin-links uninstall-bin-links - -install-bin-links: -if !WIN32 - @cd $(DESTDIR)$(bindir) && \ - for s in $(bin_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - file=`echo $$s | sed 's,:.*,,'`; \ - rm -f $$link; \ - echo "creating link '$$link' -> '$$file'"; \ - $(LN_S) $$file $$link || exit 1; \ - done -endif !WIN32 - -uninstall-bin-links: -if !WIN32 - @for s in $(bin_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - rm -f $(DESTDIR)$(bindir)/$$link; \ - done -endif !WIN32 - diff --git a/Build/source/texk/am/man.am b/Build/source/texk/am/man.am deleted file mode 100644 index 7453c0aa7f0..00000000000 --- a/Build/source/texk/am/man.am +++ /dev/null @@ -1,52 +0,0 @@ -## texk/am/man.am: Makefile fragment for kpathsea and web2c manual pages. -## -## Copyright (C) 2009-2012 Peter Breitenlohner -## You may freely use, modify and/or distribute this file. -## -## requires $(man_sources) -## requires $(KPATHSEA_PATHS_H) giving the directory of kpathsea/paths.h - -SUFFIXES = .1 .man .ps .dvi - -.man.1: - $(AM_V_GEN)sed -f sedscript $< >$@ -man_files = $(man_sources:.man=.1) -$(man_files): sedscript - -nodist_man1_MANS = $(man_files) - -# At present, all but VERSION should be unused. -sedscript: $(KPATHSEA_PATHS_H)/kpathsea/paths.h - $(AM_V_GEN)( \ - sed -n -e '/^#define/s/#define[ ][ ]*\([A-Z_a-z][A-Z_a-z]*\)[ ][ ]*\(.*\)/s%@\1@%\2%/p' \ - $< \ - | sed -e 's/"//g' -e 's/[ ]*\/\*[^*]*\*\///g'; \ - echo 's%@VER''SION@%$(VERSION)%'; \ - echo 's%@BINDIR@%$(bindir)%'; \ - echo 's%@INFODIR@%$(infodir)%'; \ - echo 's%@TEXINPUTDIR@%$(texinputdir)%'; \ - echo 's%@MFINPUTDIR@%$(mfinputdir)%'; \ - echo 's%@MPINPUTDIR@%$(mpinputdir)%'; \ - echo 's%@FONTDIR@%$(fontdir)%'; \ - echo 's%@FMTDIR@%$(fmtdir)%'; \ - echo 's%@BASEDIR@%$(basedir)%'; \ - echo 's%@MEMDIR@%$(memdir)%'; \ - echo 's%@TEXPOOLDIR@%$(texpooldir)%'; \ - echo 's%@MFPOOLDIR@%$(mfpooldir)%'; \ - echo 's%@MPPOOLDIR@%$(mppooldir)%'; \ - echo 's%@FONTMAPDIR@%$(dvipsdir)%'; \ - echo 's%@LOCALMODES@%$(localmodes)%') >sedscript - -DITROFF = groff - -.1.dvi: - $(DITROFF) -Tdvi -man $< >$@ -DVIS = $(man_files:.1=.dvi) - -.1.ps: - $(DITROFF) -Tps -man $< >$@ -PSS = $(man_files:.1=.ps) - -DISTCLEANFILES = sedscript $(man_files) $(DVIS) $(PSS) - -## end of texk/am/man.am diff --git a/Build/source/texk/am/man1_links.am b/Build/source/texk/am/man1_links.am deleted file mode 100644 index f34a3fa8e1e..00000000000 --- a/Build/source/texk/am/man1_links.am +++ /dev/null @@ -1,25 +0,0 @@ -## texk/am/man1_links.am: Makefile fragment for manual page links. -## -## Copyright (C) 2011 Peter Breitenlohner -## You may freely use, modify and/or distribute this file. -## -## requires $(man1_links) -## Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 -.PHONY: install-man1-links uninstall-man1-links - -install-man1-links: - @cd $(DESTDIR)$(man1dir) && \ - for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - file=`echo $$s | sed 's,:.*,,'`; \ - rm -f $$link.1; \ - echo "creating link '$$link.1' -> '$$file.1'"; \ - echo ".so man1/$$file.1" >$$link.1; \ - done - -uninstall-man1-links: - @for s in $(man1_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - rm -f $(DESTDIR)$(man1dir)/$$link.1; \ - done - diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am deleted file mode 100644 index a8986e487fb..00000000000 --- a/Build/source/texk/am/script_links.am +++ /dev/null @@ -1,87 +0,0 @@ -## texk/am/script_links.am: Makefile fragment for lua/perl/shell script links. -## -## Copyright (C) 2011-2013 Peter Breitenlohner -## You may freely use, modify and/or distribute this file. -## -## Install/uninstall 'linked scripts' or win32 wrappers: -## Add the prerequisite uninstall-links to uninstall-hook and one or -## or more of install-{perl,shell,sh}-scripts to install-data-hook -## -## The sh_scripts are special because they have no corresponding -## win32 wrapper, whereas shell_scripts do have such wrappers. -## -## requires conditionals WIN32 and WIN32_WRAP -## requires $(scriptsdir): e.g., texmf/scripts/chktex -## appends to $(nodist_bin_SCRIPTS) and $(EXTRA_DIST) -## -## install-lua-scripts requires $(lua_scripts), e.g., pmx2pdf -## install-perl-scripts requires $(perl_scripts), e.g., deweb -## install-shell-scripts requires $(shell_scripts), e.g. htlatex -## install-sh-scripts requires $(sh_scripts), e.g. getafm -## -.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \ - install-links uninstall-links - -all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) - -if WIN32 -if WIN32_WRAP -## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules -wrappers = $(all_scripts:=.exe) -nodist_bin_SCRIPTS += $(wrappers) -runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe -$(wrappers): $(runscript) - $(AM_V_GEN)$(LN_S) $(runscript) $@ -endif WIN32_WRAP -endif WIN32 - -install-lua-links: -if !WIN32 - $(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links -endif !WIN32 - -install-perl-links: -if !WIN32 - $(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links -endif !WIN32 - -install-shell-links: -if !WIN32 - $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links -endif !WIN32 - -install-sh-links: -if !WIN32 - $(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links -endif !WIN32 - -EXTRA_DIST += $(top_builddir)/../../build-aux/relpath - -# We support native builds, multiplatform or not, as well as distro builds. -install-links: - @relpath="$(top_srcdir)/../../build-aux/relpath"; \ - test -r $$relpath || { \ - echo 'script_links.am:install-links: could not find relpath script'; \ - exit 1; \ - }; \ - REL=`$(SHELL) $$relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ - if test -z "$$REL"; then \ - echo 'script_links.am:install_links: unable to compute relative path for linked $(TYPE) scripts' >&2; \ - exit 1; \ - fi; \ - cd $(DESTDIR)$(bindir) && \ - for f in $($(TYPE)_scripts); do \ - rm -f $$f; \ - if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \ - else echo " LINK $$f"; fi; \ - $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ - done - -uninstall-links: -if !WIN32 - @for f in $(all_scripts) $(sh_scripts); do \ - echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done -endif !WIN32 - diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog index b22459b702d..51e44cc9a32 100644 --- a/Build/source/texk/chktex/ChangeLog +++ b/Build/source/texk/chktex/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-05-30 Peter Breitenlohner Import chktex-1.7.2. diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am index 46d469e11b9..d1f9fa32157 100644 --- a/Build/source/texk/chktex/Makefile.am +++ b/Build/source/texk/chktex/Makefile.am @@ -77,7 +77,7 @@ sh_scripts = chkweb scriptsdir = texmf-dist/scripts/chktex nodist_bin_SCRIPTS = -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index 0d01cd174d9..def26017082 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -85,10 +85,10 @@ bin_PROGRAMS = chktex$(EXEEXT) @MINGW32_TRUE@ regex/regex.c \ @MINGW32_TRUE@ regex/regex.h -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(top_srcdir)/chktex-1.7.2/deweb.in \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(srcdir)/config.h.in \ + $(top_srcdir)/chktex-1.7.2/deweb.in \ $(top_srcdir)/../../build-aux/depcomp $(dist_pdfdoc_DATA) \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ @@ -618,7 +618,7 @@ all: config.h .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/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*) \ @@ -641,7 +641,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)/../../texk/am/script_links.am: +$(srcdir)/../../am/script_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck 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 + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner * 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 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 + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-03-15 Peter Breitenlohner * 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 diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index f3bb907f286..9a926beb2be 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -12,6 +12,8 @@ cff.c, dvi.[ch], cidtype0.c, cidtype2.c, dvipdfmx.c, fontmap.c, pdfcolor.[ch], truetype.c, tt_aux.[ch], type1c.c. + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-07-03 Peter Breitenlohner * Removed diffs between src/ and xsrc/ version of these files diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index 960499db6e5..b2eb804e60b 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -249,7 +249,7 @@ endif DVIPDFMX call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\" nodist_call_dvipdfmx_SOURCES = callexe.c -include $(srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am ## Manpages ## @@ -262,7 +262,7 @@ dist_man1_MANS = man/dvipdfm.1 man/dvipdft.1 man/extractbb.1 man1_links += extractbb:ebb endif DVIPDFMX -include $(srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am ## Data ## diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index 6dedbb942f2..2015ede9c5e 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -90,8 +90,8 @@ EXTRA_PROGRAMS = dvipdfmx$(EXEEXT) xdvipdfmx$(EXEEXT) @DVIPDFMX_TRUE@ dvipdfmx$(EXEEXT):ebb \ @DVIPDFMX_TRUE@ dvipdfmx$(EXEEXT):extractbb -DIST_COMMON = $(srcdir)/../am/bin_links.am \ - $(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)/config.h.in \ $(top_srcdir)/../texlive/w32_wrapper/callexe.c \ @@ -907,7 +907,7 @@ all: config.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 $(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*) \ @@ -930,7 +930,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/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 diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 423687e527e..eede51b66d7 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,13 @@ +2013-07-05 Peter Breitenlohner + + * Makefile.am, doc/Makefile.am: + Moved Makefile fragments to ../../am/. + +2013-07-05 Peter Breitenlohner + + * dvipng.test: ALso run 'dvipng --gif'. + * Makefile.am (CLEANFILES): Adapted. + 2013-05-19 Peter Breitenlohner * version.ac (new): Define dvipng version. diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index 5093a596ab3..641a39d92d6 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -89,7 +89,7 @@ dvigif_LDADD = ## Rebuild gd @GD_RULE@ -include $(srcdir)/../am/bin_links.am +include $(srcdir)/../../am/bin_links.am bin_links = dvipng$(EXEEXT):dvigif @@ -106,5 +106,5 @@ TESTS = dvipng.test EXTRA_DIST += dvipng.test dvipng-test.dvi -CLEANFILES = dvipng-test*.png +CLEANFILES = dvipng-test*.gif dvipng-test*.png diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 08fcb30640a..33c42843e63 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -86,7 +86,7 @@ bin_PROGRAMS = dvipng$(EXEEXT) $(am__EXEEXT_1) @have_ft2_TRUE@ @DVIPNG_TREE@/sfd.c \ @have_ft2_TRUE@ @DVIPNG_TREE@/tfm.c -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)/config.h.in \ $(top_srcdir)/../texlive/w32_wrapper/callexe.c \ @@ -657,7 +657,7 @@ nodist_dvigif_SOURCES = callexe.c dvigif_LDADD = bin_links = dvipng$(EXEEXT):dvigif TESTS = dvipng.test -CLEANFILES = dvipng-test*.png +CLEANFILES = dvipng-test*.gif dvipng-test*.png all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -665,7 +665,7 @@ all: config.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*) \ @@ -688,7 +688,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 diff --git a/Build/source/texk/dvipng/doc/Makefile.am b/Build/source/texk/dvipng/doc/Makefile.am index 7be4acd76e4..a0deb0c362c 100644 --- a/Build/source/texk/dvipng/doc/Makefile.am +++ b/Build/source/texk/dvipng/doc/Makefile.am @@ -42,7 +42,7 @@ dvipng.1: dvipng.texi readme.texi # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = dvipng:dvigif -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am if have_gif install-data-hook: install-man1-links diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in index 1a8f8194a1d..ba8fc30f957 100644 --- a/Build/source/texk/dvipng/doc/Makefile.in +++ b/Build/source/texk/dvipng/doc/Makefile.in @@ -78,10 +78,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(dist_noinst_SCRIPTS) \ - $(dvipng_TEXINFOS) $(top_srcdir)/../../build-aux/texinfo.tex \ - $(dist_man1_MANS) +DIST_COMMON = $(top_srcdir)/../../am/man1_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_noinst_SCRIPTS) $(dvipng_TEXINFOS) \ + $(top_srcdir)/../../build-aux/texinfo.tex $(dist_man1_MANS) subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \ @@ -363,7 +363,7 @@ all: $(BUILT_SOURCES) .SUFFIXES: .SUFFIXES: .dvi .html .info .pdf .ps .texi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -384,7 +384,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/man1_links.am: +$(top_srcdir)/../../am/man1_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/texk/dvipng/dvipng.test b/Build/source/texk/dvipng/dvipng.test index baaba3c8b77..8aa8eaba249 100755 --- a/Build/source/texk/dvipng/dvipng.test +++ b/Build/source/texk/dvipng/dvipng.test @@ -24,4 +24,8 @@ export TEXMFCNF TEXFONTMAPS ENCFONTS TEXMFMAIN TEXMFDIST TEXMFLOCAL ./dvipng -T tight -strict $srcdir/dvipng-test.dvi || exit 1 -echo View the result e.g. with display dvipng-test\*.png +echo View the result e.g. with display dvipng-test\*.png + +./dvipng --gif -T tight -strict $srcdir/dvipng-test.dvi || exit 1 + +echo View the result e.g. with display dvipng-test\*.gif diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index af188846fb5..36d266546d8 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -4,6 +4,11 @@ in path names to the cases CP936 (simplified Chinese) and CP950 (traditional Chinese). +2013-07-05 Peter Breitenlohner + + * Makefile.am, man/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-07-01 Peter Breitenlohner * c-memstr.h: Drop mapping of BSD => SYSV/ANSI string functions. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 1c9cc009304..37b104c2c7a 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -289,7 +289,7 @@ endif !WIN32 bin_links = mktexlsr:texhash -include $(top_srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am install-exec-hook: install-bin-links diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 8bb4c6d33ed..3c11138aa7c 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -106,14 +106,15 @@ host_triplet = @host@ bin_PROGRAMS = kpseaccess$(EXEEXT) kpsereadlink$(EXEEXT) \ kpsestat$(EXEEXT) kpsewhich$(EXEEXT) EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT) -DIST_COMMON = $(top_srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/c-auto.in strcasecmp.c \ - strstr.c putenv.c strtol.c $(dist_noinst_SCRIPTS) \ - $(dist_web2c_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \ - $(dist_noinst_DATA) $(dist_web2c_DATA) $(kpseinclude_HEADERS) \ - $(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \ - AUTHORS ChangeLog NEWS README ../../build-aux/compile \ +DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/c-auto.in strcasecmp.c strstr.c putenv.c strtol.c \ + $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \ + $(top_srcdir)/../../build-aux/depcomp $(dist_noinst_DATA) \ + $(dist_web2c_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \ + $(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \ + NEWS README ../../build-aux/compile \ ../../build-aux/config.guess ../../build-aux/config.sub \ ../../build-aux/depcomp ../../build-aux/install-sh \ ../../build-aux/missing ../../build-aux/texinfo.tex \ @@ -789,7 +790,7 @@ all: $(BUILT_SOURCES) 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 $(top_srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -812,7 +813,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/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/kpathsea/man/Makefile.am b/Build/source/texk/kpathsea/man/Makefile.am index f2633d5df52..ea9e6fe16fc 100644 --- a/Build/source/texk/kpathsea/man/Makefile.am +++ b/Build/source/texk/kpathsea/man/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/kpathsea/man/ ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2013 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## man_sources = \ @@ -17,13 +17,13 @@ EXTRA_DIST = $(man_sources) KPATHSEA_PATHS_H = ${top_builddir}/.. -include $(top_srcdir)/../am/man.am +include $(top_srcdir)/../../am/man.am # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = \ mktexlsr:texhash -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am install-data-hook: install-man1-links diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in index 9c2031969c6..33d685076fd 100644 --- a/Build/source/texk/kpathsea/man/Makefile.in +++ b/Build/source/texk/kpathsea/man/Makefile.in @@ -77,8 +77,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/../am/man.am \ - $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(top_srcdir)/../../am/man.am \ + $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -301,7 +301,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .1 .man .ps .dvi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -322,7 +322,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/man.am $(top_srcdir)/../am/man1_links.am: +$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_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/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 + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-07-02 Peter Breitenlohner * 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 +## Copyright (C) 2009-2013 Peter Breitenlohner ## 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 diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index e1099626f19..2af32b58aff 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner + + * tl_scripts/Makefile.am: Moved Makefile fragments to ../../am/. + 2013-04-19 Peter Breitenlohner * tests/updmap-cmdline-test.pl: Adapt to updmap.pl again moved. diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am index 0bd604c140e..8c3bfabd78a 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.am +++ b/Build/source/texk/texlive/tl_scripts/Makefile.am @@ -45,7 +45,7 @@ sh_scripts = \ nodist_bin_SCRIPTS = scriptsdir = texmf-dist/scripts/texlive # -include $(srcdir)/../../../texk/am/script_links.am +include $(top_srcdir)/../../am/script_links.am # texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(sh_scripts:=.sh) @@ -80,7 +80,7 @@ bin_links = \ kpsetool:kpsexpand \ kpsetool:kpsepath -include $(top_srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am man1_links = \ fmtutil:fmtutil-sys \ @@ -90,7 +90,7 @@ man1_links = \ texconfig:texconfig-sys \ updmap:updmap-sys -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am ## Support files texconfigdir = $(datarootdir)/texmf-dist/texconfig diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index 3aaf8a3100e..b47f9d5baa3 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -77,9 +77,9 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(srcdir)/../../../texk/am/script_links.am \ - $(top_srcdir)/../am/bin_links.am \ - $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(top_srcdir)/../../am/script_links.am \ + $(top_srcdir)/../../am/bin_links.am \ + $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(dist_texconfig_SCRIPTS) \ $(dist_texmf_SCRIPTS) $(dist_man_MANS) $(dist_texconfig_DATA) \ $(dist_web2c_DATA) ChangeLog README @@ -321,7 +321,7 @@ all_shell_scripts = $(shell_scripts) $(sh_scripts) all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../../texk/am/script_links.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/script_links.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*) \ @@ -342,7 +342,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; -$(srcdir)/../../../texk/am/script_links.am $(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am: +$(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_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/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 34a482ad2a7..d006b3f19cd 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Peter Breitenlohner + + * Makefile.am, man/Makefile.am, omegafonts/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-07-04 Peter Breitenlohner * tests/1-4.jpg, tests/basic.tex, tests/lily-ledger-broken.png: diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 80c6bde623b..83eae378c1e 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -234,7 +234,7 @@ include $(srcdir)/synctexdir/am/synctex.am include $(srcdir)/libmd5/am/md5.am ## Symlinks within $(bindir) -include $(srcdir)/../am/bin_links.am +include $(srcdir)/../../am/bin_links.am install-exec-hook: install-bin-links $(install_exe_links) uninstall-hook: uninstall-bin-links $(uninstall_exe_links) diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 1e870a16e5c..39081ed0ec3 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -128,7 +128,7 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \ $(srcdir)/omegaware/am/omegaware.am \ $(srcdir)/alephdir/am/aleph.am \ $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am \ - $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ + $(srcdir)/../../am/bin_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ $(top_srcdir)/luatexdir/luafontloader/ff-config.in \ @@ -3117,7 +3117,7 @@ all: ff-config.h .SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -3139,7 +3139,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/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../am/bin_links.am: +$(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am index bcedd1f9e75..b624a86b670 100644 --- a/Build/source/texk/web2c/man/Makefile.am +++ b/Build/source/texk/web2c/man/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/web2c/man/ ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2013 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## man_sources = $(bootstrap_man_sources) @@ -80,9 +80,9 @@ misc_man_sources = \ latex.man \ pdfetex.man -include $(top_srcdir)/../am/man.am +include $(top_srcdir)/../../am/man.am -include $(top_srcdir)/../am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am install-data-hook: install-man1-links diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index a6ab9e5afc7..95a1fd7b9f5 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -92,8 +92,8 @@ host_triplet = @host@ @OTANGLE_TRUE@am__append_13 = dvicopy:odvicopy dvitype:odvitype tangle:otangle @ALEPH_TRUE@am__append_14 = aleph.man @ALEPH_TRUE@am__append_15 = aleph:lamed -DIST_COMMON = $(top_srcdir)/../am/man.am \ - $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(top_srcdir)/../../am/man.am \ + $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am ChangeLog README subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -433,7 +433,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .1 .man .ps .dvi -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -454,7 +454,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/man.am $(top_srcdir)/../am/man1_links.am: +$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_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/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am index 6f65f9ebe00..7e7fb7b6000 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.am +++ b/Build/source/texk/web2c/omegafonts/Makefile.am @@ -79,7 +79,7 @@ bin_links = \ omfonts$(EXEEXT):ovf2ovp \ omfonts$(EXEEXT):ovp2ovf -include $(top_srcdir)/../am/bin_links.am +include $(top_srcdir)/../../am/bin_links.am if OTANGLE if OMFONTS diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 89d2637065c..5fa5a92b7b3 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -83,9 +83,9 @@ bin_PROGRAMS = $(am__EXEEXT_1) @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@noinst_PROGRAMS = \ @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ call_omfonts$(EXEEXT) EXTRA_PROGRAMS = omfonts$(EXEEXT) -DIST_COMMON = $(top_srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am pl-parser.h pl-parser.c pl-lexer.c \ - $(top_srcdir)/../../build-aux/depcomp \ +DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am pl-parser.h \ + pl-parser.c pl-lexer.c $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/ylwrap \ $(top_srcdir)/../../build-aux/test-driver ChangeLog subdir = omegafonts @@ -712,7 +712,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .l .lo .log .o .obj .test .test$(EXEEXT) .trs .y -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -733,7 +733,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/bin_links.am: +$(top_srcdir)/../../am/bin_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- cgit v1.2.3