diff options
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/man/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/man/Makefile.in | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/Makefile.in | 10 |
7 files changed, 22 insertions, 17 deletions
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 <peb@mppmu.mpg.de> + + * Makefile.am, man/Makefile.am, omegafonts/Makefile.am: + Moved Makefile fragments to ../../am/. + 2013-07-04 Peter Breitenlohner <peb@mppmu.mpg.de> * 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 <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## 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 |