From 37b29e92d678aeb977a53c3ec164cac174fb282e Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 4 Oct 2011 10:08:44 +0000 Subject: Avoid that 'make distclean' removes distributed files git-svn-id: svn://tug.org/texlive/trunk@24188 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/bibtex8/ChangeLog | 4 + Build/source/texk/bibtex8/Makefile.am | 4 +- Build/source/texk/bibtex8/Makefile.in | 3 +- Build/source/texk/web2c/ChangeLog | 4 + Build/source/texk/web2c/Makefile.in | 116 +++++++++++----------- Build/source/texk/web2c/am/web.am | 4 +- Build/source/texk/web2c/luatexdir/ChangeLog | 4 + Build/source/texk/web2c/luatexdir/am/libluatex.am | 6 +- Build/source/texk/web2c/mplibdir/ChangeLog | 4 + Build/source/texk/web2c/mplibdir/am/libmplib.am | 5 +- Build/source/texk/web2c/ptexdir/ChangeLog | 4 + Build/source/texk/web2c/ptexdir/am/ptex.am | 2 +- 12 files changed, 89 insertions(+), 71 deletions(-) diff --git a/Build/source/texk/bibtex8/ChangeLog b/Build/source/texk/bibtex8/ChangeLog index 4af9c68dffe..20f8b36b86a 100644 --- a/Build/source/texk/bibtex8/ChangeLog +++ b/Build/source/texk/bibtex8/ChangeLog @@ -1,3 +1,7 @@ +2011-10-04 Peter Breitenlohner + + * Makefile.am (DISTCLEANFILES): Preserve distributed files. + 2011-04-18 Peter Breitenlohner Avoid 'differ in signedness' warnings. diff --git a/Build/source/texk/bibtex8/Makefile.am b/Build/source/texk/bibtex8/Makefile.am index 5a02c0d3ba7..fe109aee86f 100644 --- a/Build/source/texk/bibtex8/Makefile.am +++ b/Build/source/texk/bibtex8/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/bibtex8/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -67,7 +67,7 @@ EXTRA_DIST += tests/sort.aux \ tests/testdata.bib tests/teststyle.bst DISTCLEANFILES += tests/xsort.aux tests/xsort.bbl tests/xsort.blg ## tests/bibtex-mem.test -DISTCLEANFILES += tests/memtest* +DISTCLEANFILES += tests/memtest.bib tests/memtest?.* ## Not used ## diff --git a/Build/source/texk/bibtex8/Makefile.in b/Build/source/texk/bibtex8/Makefile.in index 397dabbe2a8..98a8ee8a70a 100644 --- a/Build/source/texk/bibtex8/Makefile.in +++ b/Build/source/texk/bibtex8/Makefile.in @@ -294,7 +294,8 @@ EXTRA_DIST = $(TESTS) tests/sort.aux tests/sort1.bbl tests/sort2.bbl \ bt371csf.zip dos-dj.mak dos-emx.mak os2.mak unix.mak \ csf/00readme.txt csf/COPYING csf/HISTORY csf/file_id.diz DISTCLEANFILES = tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg \ - tests/xsort.aux tests/xsort.bbl tests/xsort.blg tests/memtest* + tests/xsort.aux tests/xsort.bbl tests/xsort.blg \ + tests/memtest.bib tests/memtest?.* all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index e6189d6167a..9f013ced715 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2011-10-04 Peter Breitenlohner + + * am/web.am (DISTCLEANFILES): Preserve distributed files. + 2011-09-30 Peter Breitenlohner * tex.ch (print_file_line): Bug fix: avoid uninitialized lineno. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 0fc419d7bcb..1de40f65859 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -428,7 +428,7 @@ am_libluatex_a_OBJECTS = libluatex_a-pdftoepdf.$(OBJEXT) \ libluatex_a-lstatslib.$(OBJEXT) \ libluatex_a-ltexiolib.$(OBJEXT) libluatex_a-ltexlib.$(OBJEXT) \ libluatex_a-ltokenlib.$(OBJEXT) libluatex_a-avl.$(OBJEXT) \ - libluatex_a-synctex.$(OBJEXT) + libluatex_a-synctex.$(OBJEXT) libluatex_a-lmplib.$(OBJEXT) nodist_libluatex_a_OBJECTS = libluatex_a-dvigen.$(OBJEXT) \ libluatex_a-dofont.$(OBJEXT) libluatex_a-luafont.$(OBJEXT) \ libluatex_a-mapfile.$(OBJEXT) libluatex_a-pkin.$(OBJEXT) \ @@ -489,8 +489,7 @@ nodist_libluatex_a_OBJECTS = libluatex_a-dvigen.$(OBJEXT) \ libluatex_a-texfileio.$(OBJEXT) libluatex_a-texmath.$(OBJEXT) \ libluatex_a-texnodes.$(OBJEXT) libluatex_a-textcodes.$(OBJEXT) \ libluatex_a-textoken.$(OBJEXT) libluatex_a-avlstuff.$(OBJEXT) \ - libluatex_a-managed-sa.$(OBJEXT) libluatex_a-utils.$(OBJEXT) \ - libluatex_a-lmplib.$(OBJEXT) + libluatex_a-managed-sa.$(OBJEXT) libluatex_a-utils.$(OBJEXT) libluatex_a_OBJECTS = $(am_libluatex_a_OBJECTS) \ $(nodist_libluatex_a_OBJECTS) libmd5_a_AR = $(AR) $(ARFLAGS) @@ -1391,21 +1390,21 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ triptrap/trip2.in triptrap/tripin.log triptrap/tripman.tex \ triptrap/tripos.tex triptrap/writeo triptrap/writeo.2 \ mplibdir/ChangeLog $(mpost_web) $(mp_tests) $(libmplib_web) \ - mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \ - etexdir/ChangeLog etexdir/INSTALL etexdir/README \ - etexdir/etex_gen.tex $(etex_tests) tests/wprob.tex \ - etexdir/etrip/etrip.diffs etexdir/etrip/etrip.fot \ - etexdir/etrip/etrip.log etexdir/etrip/etrip.out \ - etexdir/etrip/etrip.pl etexdir/etrip/etrip.tex \ - etexdir/etrip/etrip.typ etexdir/etrip/etrip1.in \ - etexdir/etrip/etrip2.in etexdir/etrip/etrip3.in \ - etexdir/etrip/etripin.log etexdir/etrip/etripman.tex \ - etexdir/etrip/texmf.cnf etexdir/etrip/trip2.in $(ptex_tests) \ - $(pweb_tests) $(ptex_web_srcs) $(ptex_ch_srcs) \ - ptexdir/ptex.defines ptexdir/pbibtex.ch web2c/cvtbib.sed \ - ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \ - ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \ - ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \ + $(etex_web_srcs) $(etex_ch_srcs) etexdir/ChangeLog \ + etexdir/INSTALL etexdir/README etexdir/etex_gen.tex \ + $(etex_tests) tests/wprob.tex etexdir/etrip/etrip.diffs \ + etexdir/etrip/etrip.fot etexdir/etrip/etrip.log \ + etexdir/etrip/etrip.out etexdir/etrip/etrip.pl \ + etexdir/etrip/etrip.tex etexdir/etrip/etrip.typ \ + etexdir/etrip/etrip1.in etexdir/etrip/etrip2.in \ + etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \ + etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \ + etexdir/etrip/trip2.in $(ptex_tests) $(pweb_tests) \ + $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines \ + ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \ + ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \ + ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \ + ptexdir/INSTALL.txt ptexdir/README.txt \ ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \ ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \ tests/memdata3.bst ptexdir/tests/goth10.tfm \ @@ -1585,30 +1584,31 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ common-ctangle ctangleboot.c cwebboot.c cwebboot.h cftest.p \ $(web_programs:=.c) $(web_programs:=.h) $(web_programs:=.p) \ $(web_programs:=-web2c) tests/xexampl.aux tests/xexampl.bbl \ - tests/xexampl.blg tests/memtest* tests/xstory.dvi \ - tests/xpplr.dvi tests/xstory.dvityp tests/xpagenum.typ \ - cmr10.dvi tests/xcmr10.dvi cmr10.pk tests/xcmr10.pk \ - tests/xcmr10.gft1 tests/xcmr10.gft2 io.tex tests/io.tex \ - tests/xpatout pattmp.4 cmr10.gf tests/xcmr10.600gf \ - tests/xcmr10.pktyp tests/xcmr10.tfm tests/xtexpool.typ \ - tests/xcmr10.pl tests/xptmr.vpl tests/xptmr.tfm tests/xptmr.vf \ - pooltype.tex ctie.c cweave.c tie.c ctie.outc ctie.outm \ - common.tex common.scn common.idx tie.outc tie.outm \ - $(nodist_tex_SOURCES) tex-final.ch tex-web2c tex.p tex.pool \ - tex-tangle trip.diffs mftrap.diffs $(nodist_libmf_a_SOURCES) \ - mf-final.ch mf-web2c mf.p mf.pool mf-tangle \ - $(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs ptmr.mpx \ - tests/xptmr.mpx tests/xstory.mpx $(nodist_libmplib_a_SOURCES) \ - mp-tangle mpmath-tangle psout-tangle svgout-tangle \ - $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \ - etex.pool etex-tangle etrip.diffs wprob.log wprob.tex \ - $(pweb_programs:=.c) $(pweb_programs:=.h) $(pweb_programs:=.p) \ - $(pweb_programs:=-web2c) $(pweb_programs:=.web) \ - $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \ - ptex.pool ptex-tangle tests/nissya_bib.* tests/xexampl.aux \ - tests/xexampl.bbl tests/xexampl.blg tests/memtest* \ - tests/xstory.dvityp tests/xpagenum.typ tests/xcmr10.tfm \ - tests/xcmr10.pl tests/xsample.typ tests/x*min10.* ptrip.diffs \ + tests/xexampl.blg tests/memtest.bib tests/memtest?.* \ + tests/xstory.dvi tests/xpplr.dvi tests/xstory.dvityp \ + tests/xpagenum.typ cmr10.dvi tests/xcmr10.dvi cmr10.pk \ + tests/xcmr10.pk tests/xcmr10.gft1 tests/xcmr10.gft2 io.tex \ + tests/io.tex tests/xpatout pattmp.4 cmr10.gf \ + tests/xcmr10.600gf tests/xcmr10.pktyp tests/xcmr10.tfm \ + tests/xtexpool.typ tests/xcmr10.pl tests/xptmr.vpl \ + tests/xptmr.tfm tests/xptmr.vf pooltype.tex ctie.c cweave.c \ + tie.c ctie.outc ctie.outm common.tex common.scn common.idx \ + tie.outc tie.outm $(nodist_tex_SOURCES) tex-final.ch tex-web2c \ + tex.p tex.pool tex-tangle trip.diffs mftrap.diffs \ + $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c mf.p mf.pool \ + mf-tangle $(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs \ + ptmr.mpx tests/xptmr.mpx tests/xstory.mpx \ + $(nodist_libmplib_a_SOURCES) mp-tangle mpmath-tangle \ + psout-tangle svgout-tangle $(nodist_etex_SOURCES) etex.web \ + etex.ch etex-web2c etex.p etex.pool etex-tangle etrip.diffs \ + wprob.log wprob.tex $(pweb_programs:=.c) $(pweb_programs:=.h) \ + $(pweb_programs:=.p) $(pweb_programs:=-web2c) \ + $(pweb_programs:=.web) $(nodist_ptex_SOURCES) ptex.web ptex.ch \ + ptex-web2c ptex.p ptex.pool ptex-tangle tests/nissya_bib.* \ + tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg \ + tests/memtest.bib tests/memtest?.* tests/xstory.dvityp \ + tests/xpagenum.typ tests/xcmr10.tfm tests/xcmr10.pl \ + tests/xsample.typ tests/x*min10.* ptrip.diffs \ $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \ eptex.pool eptex-tangle eptrip.diffs $(upweb_programs:=.c) \ $(upweb_programs:=.h) $(upweb_programs:=.p) \ @@ -2449,7 +2449,7 @@ nodist_libluatex_a_SOURCES = dvigen.c dofont.c luafont.c mapfile.c \ mathcodes.c memoryword.c mlist.c nesting.c packaging.c \ postlinebreak.c primitive.c printing.c scanning.c stringpool.c \ texdeffont.c texfileio.c texmath.c texnodes.c textcodes.c \ - textoken.c avlstuff.c managed-sa.c utils.c mplibdir/lmplib.c + textoken.c avlstuff.c managed-sa.c utils.c libluatex_a_SOURCES = luatexdir/luatex.h luatexdir/dvi/dvigen.h \ luatexdir/font/luatexfont.h luatexdir/font/mapfile.h \ luatexdir/font/sfnt.h luatexdir/font/texfont.h \ @@ -2502,7 +2502,7 @@ libluatex_a_SOURCES = luatexdir/luatex.h luatexdir/dvi/dvigen.h \ luatexdir/utils/avl.h luatexdir/utils/avlstuff.h \ luatexdir/utils/managed-sa.h luatexdir/utils/utils.h \ synctexdir/synctex-common.h synctexdir/synctex-luatex.h \ - synctexdir/synctex.c synctexdir/synctex.h + synctexdir/synctex.c synctexdir/synctex.h mplibdir/lmplib.c luatex_dvi_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/dvi $(ctangle) luatex_font_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/font $(ctangle) luatex_image_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/image $(ctangle) @@ -5396,6 +5396,20 @@ libluatex_a-synctex.obj: synctexdir/synctex.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi` +libluatex_a-lmplib.o: mplibdir/lmplib.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.o `test -f 'mplibdir/lmplib.c' || echo '$(srcdir)/'`mplibdir/lmplib.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mplibdir/lmplib.c' object='libluatex_a-lmplib.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.o `test -f 'mplibdir/lmplib.c' || echo '$(srcdir)/'`mplibdir/lmplib.c + +libluatex_a-lmplib.obj: mplibdir/lmplib.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.obj -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.obj `if test -f 'mplibdir/lmplib.c'; then $(CYGPATH_W) 'mplibdir/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/lmplib.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mplibdir/lmplib.c' object='libluatex_a-lmplib.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.obj `if test -f 'mplibdir/lmplib.c'; then $(CYGPATH_W) 'mplibdir/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/lmplib.c'; fi` + libluatex_a-dvigen.o: dvigen.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-dvigen.o -MD -MP -MF $(DEPDIR)/libluatex_a-dvigen.Tpo -c -o libluatex_a-dvigen.o `test -f 'dvigen.c' || echo '$(srcdir)/'`dvigen.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-dvigen.Tpo $(DEPDIR)/libluatex_a-dvigen.Po @@ -6726,20 +6740,6 @@ libluatex_a-utils.obj: utils.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` -libluatex_a-lmplib.o: mplibdir/lmplib.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.o `test -f 'mplibdir/lmplib.c' || echo '$(srcdir)/'`mplibdir/lmplib.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mplibdir/lmplib.c' object='libluatex_a-lmplib.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.o `test -f 'mplibdir/lmplib.c' || echo '$(srcdir)/'`mplibdir/lmplib.c - -libluatex_a-lmplib.obj: mplibdir/lmplib.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.obj -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.obj `if test -f 'mplibdir/lmplib.c'; then $(CYGPATH_W) 'mplibdir/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/lmplib.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mplibdir/lmplib.c' object='libluatex_a-lmplib.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.obj `if test -f 'mplibdir/lmplib.c'; then $(CYGPATH_W) 'mplibdir/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/lmplib.c'; fi` - libmd5_a-md5.o: libmd5/md5.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmd5_a-md5.o -MD -MP -MF $(DEPDIR)/libmd5_a-md5.Tpo -c -o libmd5_a-md5.o `test -f 'libmd5/md5.c' || echo '$(srcdir)/'`libmd5/md5.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmd5_a-md5.Tpo $(DEPDIR)/libmd5_a-md5.Po diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am index e6dc123bed8..c615abd4bea 100644 --- a/Build/source/texk/web2c/am/web.am +++ b/Build/source/texk/web2c/am/web.am @@ -1,6 +1,6 @@ ## texk/web2c/am/web.am: Makefile fragment for normal web programs (except tangle). ## -## Copyright (C) 2009, 2010 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. web_programs = bibtex dvicopy dvitype gftodvi gftopk gftype mft \ @@ -161,7 +161,7 @@ EXTRA_DIST += $(web_tests) DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg ## tests/bibtex-mem.test EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst -DISTCLEANFILES += tests/memtest* +DISTCLEANFILES += tests/memtest.bib tests/memtest?.* ## dvicopy.test DISTCLEANFILES += tests/xstory.dvi tests/xpplr.dvi ## dvitype.test diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 31948d3f717..1400bbc68a5 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-10-04 Peter Breitenlohner + + * am/libluatex.am: Avoid to `clean' ../mplibdir/lmplib.c. + 2011-09-30 Peter Breitenlohner * tex/printing.w (print_file_line): Bug fix: avoid uninitialized diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 6ea07d54234..6bc4c2a8727 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/libluatex.am: Makefile fragment for libluatex. ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## libluatex @@ -481,9 +481,9 @@ libluatex_a_SOURCES += \ synctexdir/synctex.c \ synctexdir/synctex.h -## from mplibdir +## from ../mplibdir ## -nodist_libluatex_a_SOURCES += \ +libluatex_a_SOURCES += \ mplibdir/lmplib.c $(libluatex_a_OBJECTS): libff.a libmplib.a diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 5a3a2585e46..d3da6f8d7b5 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,7 @@ +2011-10-04 Peter Breitenlohner + + * am/libmplib.am (EXTRA_DIST): Drop lmplib.c, used by luaTeX. + 2011-06-06 Taco Hoekwater * mpost.w (mpost_run_editor): Do not attempt to use EDITOR. diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am index 8aa1b9b0921..dd3eefd63a9 100644 --- a/Build/source/texk/web2c/mplibdir/am/libmplib.am +++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am @@ -1,6 +1,6 @@ ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib. ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## libmplib.a, used by MetaPost and luaTeX @@ -53,6 +53,3 @@ EXTRA_DIST += $(libmplib_web) DISTCLEANFILES += $(nodist_libmplib_a_SOURCES) \ mp-tangle mpmath-tangle psout-tangle svgout-tangle -## only used by luaTeX -EXTRA_DIST += mplibdir/lmplib.c - diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 7e89b61286f..0e88f576f3a 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-10-04 Peter Breitenlohner + + * am/ptex.am (DISTCLEANFILES): Preserve distributed files. + 2011-08-29 Peter Breitenlohner * pbibtex.ch: Use nil, not 0 as arg of set_enc_string(). diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 2b1523bbbc4..c3879e2f5a9 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -206,7 +206,7 @@ DISTCLEANFILES += tests/nissya_bib.* DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg ## ptexdir/pbibtex-mem.test EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst -DISTCLEANFILES += tests/memtest* +DISTCLEANFILES += tests/memtest.bib tests/memtest?.* ## ptexdir/pdvitype.test DISTCLEANFILES += tests/xstory.dvityp tests/xpagenum.typ ## ptexdir/ppltotf.test -- cgit v1.2.3