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/utils/ps2eps/ChangeLog | 4 ++++ Build/source/utils/ps2eps/Makefile.am | 2 +- Build/source/utils/ps2eps/Makefile.in | 11 +++++------ Build/source/utils/psutils/ChangeLog | 4 ++++ Build/source/utils/psutils/Makefile.am | 2 +- Build/source/utils/psutils/Makefile.in | 11 +++++------ Build/source/utils/texdoctk/ChangeLog | 4 ++++ Build/source/utils/texdoctk/Makefile.am | 2 +- Build/source/utils/texdoctk/Makefile.in | 21 ++++++++++----------- Build/source/utils/xindy/ChangeLog | 4 ++++ Build/source/utils/xindy/Makefile.am | 2 +- Build/source/utils/xindy/Makefile.in | 19 +++++++++---------- Build/source/utils/xpdfopen/ChangeLog | 4 ++++ Build/source/utils/xpdfopen/Makefile.am | 2 +- Build/source/utils/xpdfopen/Makefile.in | 6 +++--- 15 files changed, 57 insertions(+), 41 deletions(-) (limited to 'Build/source/utils') diff --git a/Build/source/utils/ps2eps/ChangeLog b/Build/source/utils/ps2eps/ChangeLog index 2ec3e19025b..01176676ab5 100644 --- a/Build/source/utils/ps2eps/ChangeLog +++ b/Build/source/utils/ps2eps/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner * Makefile.am (scriptsdir): Change texmf => texmf-dist. diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am index e5b7f0d1d95..84cdba07ce7 100644 --- a/Build/source/utils/ps2eps/Makefile.am +++ b/Build/source/utils/ps2eps/Makefile.am @@ -29,7 +29,7 @@ perl_scripts = ps2eps scriptsdir = texmf-dist/scripts/ps2eps nodist_bin_SCRIPTS = -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in index 99791ad099a..4dfef1bcb90 100644 --- a/Build/source/utils/ps2eps/Makefile.in +++ b/Build/source/utils/ps2eps/Makefile.in @@ -78,10 +78,9 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = bbox$(EXEEXT) -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(top_srcdir)/../../build-aux/depcomp \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ @@ -507,7 +506,7 @@ all: all-am .SUFFIXES: .c .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*) \ @@ -530,7 +529,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/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog index 2d24c279958..52e7aad99db 100644 --- a/Build/source/utils/psutils/ChangeLog +++ b/Build/source/utils/psutils/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner * Makefile.am (scriptsdir): Change texmf => texmf-dist. diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am index 4b9253eb2ca..983519af11a 100644 --- a/Build/source/utils/psutils/Makefile.am +++ b/Build/source/utils/psutils/Makefile.am @@ -96,7 +96,7 @@ sh_scripts = \ scriptsdir = texmf-dist/scripts/psutils 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/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in index bd2605064e6..0786b3ed0fb 100644 --- a/Build/source/utils/psutils/Makefile.in +++ b/Build/source/utils/psutils/Makefile.in @@ -79,10 +79,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = epsffit$(EXEEXT) psbook$(EXEEXT) psnup$(EXEEXT) \ psresize$(EXEEXT) psselect$(EXEEXT) pstops$(EXEEXT) -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(top_srcdir)/psutils-1.17/patchlev.h.in \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(top_srcdir)/psutils-1.17/patchlev.h.in \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ @@ -618,7 +617,7 @@ all: all-am .SUFFIXES: .c .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 +640,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/utils/texdoctk/ChangeLog b/Build/source/utils/texdoctk/ChangeLog index c301afb7021..150ae366ad4 100644 --- a/Build/source/utils/texdoctk/ChangeLog +++ b/Build/source/utils/texdoctk/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-02-08 Peter Breitenlohner * Makefile.am (scriptsdir): Change texmf => texmf-dist. diff --git a/Build/source/utils/texdoctk/Makefile.am b/Build/source/utils/texdoctk/Makefile.am index b33291b547d..41da8a36950 100644 --- a/Build/source/utils/texdoctk/Makefile.am +++ b/Build/source/utils/texdoctk/Makefile.am @@ -13,7 +13,7 @@ perl_scripts = texdoctk scriptsdir = texmf-dist/scripts/texdoctk nodist_bin_SCRIPTS = # -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am # texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = texdoctk.pl diff --git a/Build/source/utils/texdoctk/Makefile.in b/Build/source/utils/texdoctk/Makefile.in index f05e87dc6b1..0018ca01e0f 100644 --- a/Build/source/utils/texdoctk/Makefile.in +++ b/Build/source/utils/texdoctk/Makefile.in @@ -76,15 +76,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(dist_texmf_SCRIPTS) $(dist_man1_MANS) ChangeLog 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 ../../build-aux/ylwrap \ - ../../build-aux/ltmain.sh \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(dist_texmf_SCRIPTS) $(dist_man1_MANS) \ + ChangeLog 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 \ + ../../build-aux/ylwrap ../../build-aux/ltmain.sh \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing @@ -278,7 +277,7 @@ all: all-am .SUFFIXES: 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*) \ @@ -301,7 +300,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/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index b449cd76ffb..728b100dc00 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2013-06-20 Peter Breitenlohner * configure.ac, ac/xindy.ac: Fixed some typos, replacing diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am index 964c10b613e..141ddc0e642 100644 --- a/Build/source/utils/xindy/Makefile.am +++ b/Build/source/utils/xindy/Makefile.am @@ -53,7 +53,7 @@ perl_scripts = texindy xindy scriptsdir = texmf-dist/scripts/xindy nodist_bin_SCRIPTS = -include $(srcdir)/../../texk/am/script_links.am +include $(srcdir)/../../am/script_links.am install-data-hook: install-perl-links diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index 37cbb2c9d0c..6c4edc141c4 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -77,14 +77,13 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) ChangeLog \ - ../../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 ../../build-aux/ylwrap \ - ../../build-aux/ltmain.sh \ +DIST_COMMON = $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) ChangeLog ../../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 \ + ../../build-aux/ylwrap ../../build-aux/ltmain.sh \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ @@ -366,7 +365,7 @@ all: all-recursive .SUFFIXES: 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*) \ @@ -389,7 +388,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/utils/xpdfopen/ChangeLog b/Build/source/utils/xpdfopen/ChangeLog index b40b6e4f743..acca86064b2 100644 --- a/Build/source/utils/xpdfopen/ChangeLog +++ b/Build/source/utils/xpdfopen/ChangeLog @@ -1,3 +1,7 @@ +2013-07-05 Peter Breitenlohner + + * Makefile.am: Moved Makefile fragments to ../../am/. + 2012-12-15 Peter Breitenlohner * configure.ac: Use KPSE_BASIC to enable silent rules. diff --git a/Build/source/utils/xpdfopen/Makefile.am b/Build/source/utils/xpdfopen/Makefile.am index 9c259383f83..0e1a2e6909a 100644 --- a/Build/source/utils/xpdfopen/Makefile.am +++ b/Build/source/utils/xpdfopen/Makefile.am @@ -23,7 +23,7 @@ dist_man1_MANS = pdfopen.1 # Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1 man1_links = pdfopen:pdfclose -include $(top_srcdir)/../../texk/am/man1_links.am +include $(top_srcdir)/../../am/man1_links.am install-data-hook: install-man1-links diff --git a/Build/source/utils/xpdfopen/Makefile.in b/Build/source/utils/xpdfopen/Makefile.in index 1ff47671f7d..73bfc3378a3 100644 --- a/Build/source/utils/xpdfopen/Makefile.in +++ b/Build/source/utils/xpdfopen/Makefile.in @@ -77,7 +77,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = pdfopen$(EXEEXT) pdfclose$(EXEEXT) -DIST_COMMON = $(top_srcdir)/../../texk/am/man1_links.am \ +DIST_COMMON = $(top_srcdir)/../../am/man1_links.am \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(top_srcdir)/../../build-aux/depcomp $(dist_man1_MANS) \ @@ -327,7 +327,7 @@ all: all-am .SUFFIXES: .c .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../texk/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*) \ @@ -350,7 +350,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)/../../texk/am/man1_links.am: +$(top_srcdir)/../../am/man1_links.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -- cgit v1.2.3