diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-10 13:18:47 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-10 13:18:47 +0000 |
| commit | 5af1aa3cd449e5a6abb4972dcd9090bbe61162de (patch) | |
| tree | cb4e4668b85d773dbb9ed7019ea250488a760948 | |
| parent | 3afa3f06a4c3c3750742e7a6db8f20314c53183a (diff) | |
texk/web2c: reorganize headers and CPPFLAGS
git-svn-id: svn://tug.org/texlive/trunk@18865 c570f23f-e606-0410-a88d-b1316a301751
72 files changed, 445 insertions, 322 deletions
diff --git a/Build/source/README.config b/Build/source/README.config index 4de2c19b838..934a019dea0 100644 --- a/Build/source/README.config +++ b/Build/source/README.config @@ -242,7 +242,7 @@ Used instead of searching for programs in PATH. For system freetype2 library. 4.2. ICU_CONFIG=/path/to/icu-config ----------------------------------------- +----------------------------------- For system icu libraries. 4.3. PKG_CONFIG=/path/to/pkg-config diff --git a/Build/source/configure b/Build/source/configure index 3f046be2f94..9d858c4b129 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for TeX Live 2010-05-18. +# Generated by GNU Autoconf 2.65 for TeX Live 2010-06-10. # # Report bugs to <tex-k@tug.org>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TeX Live' PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2010-05-18' -PACKAGE_STRING='TeX Live 2010-05-18' +PACKAGE_VERSION='2010-06-10' +PACKAGE_STRING='TeX Live 2010-06-10' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1587,7 +1587,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live 2010-05-18 to adapt to many kinds of systems. +\`configure' configures TeX Live 2010-06-10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1661,7 +1661,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2010-05-18:";; + short | recursive ) echo "Configuration of TeX Live 2010-06-10:";; esac cat <<\_ACEOF @@ -1943,7 +1943,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2010-05-18 +TeX Live configure 2010-06-10 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2546,7 +2546,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live $as_me 2010-05-18, which was +It was created by TeX Live $as_me 2010-06-10, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -9271,7 +9271,7 @@ fi # Define the identity of the package. PACKAGE='tex-live' - VERSION='2010-05-18' + VERSION='2010-06-10' cat >>confdefs.h <<_ACEOF @@ -20312,7 +20312,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live $as_me 2010-05-18, which was +This file was extended by TeX Live $as_me 2010-06-10, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20369,7 +20369,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TeX Live config.status 2010-05-18 +TeX Live config.status 2010-06-10 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/Build/source/configure.ac b/Build/source/configure.ac index 33ad33df212..91b3cdc4596 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([TeX Live], [2010-05-18], [tex-k@tug.org]) +AC_INIT([TeX Live], [2010-06-10], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 42d6a4f0f35..53ffcd96351 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,25 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (AM_CPPFLAGS, INCLUDES): Move $(KPATHSEA_INCLUDES). + * am/cweb.am (tie_CPPFLAGS): Add $(AM_CPPFLAGS). + * am/texmf.am (tex_CPPFLAGS, mf_CPPFLAGS): Add $(AM_CPPFLAGS). + (mf_nowin_CPPFLAGS): Use $(mf_CPPFLAGS). + +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * config.h (deleted): Moved ... + * w2c/config.h (new): ... to here. + * configure.ac: Create w2c/c-auto.h instead of c-auto.h. + * c-auto.h (new): Temporary file including <w2c/c-auto.h>, to be + removed when all luatexdir/ files are changed to directly + include <w2c/c-auto.h>. + * config.h (new): Temporary file including <w2c/config.h>, to be + removed when all mplibdir/ and luatexdir/ files are changed to + directly include <w2c/config.h>. + * Makefile.am (EXTRA_DIST): Adjust. + * cpascal.h: #include <w2c/config.h> instead of "config.h". + 2010-06-04 Karl Berry <karl@tug.org> * configure.ac (web2_version): remove pretest for diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index a587531d2d5..925dee799d8 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -5,8 +5,8 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -INCLUDES = $(KPATHSEA_INCLUDES) -AM_CPPFLAGS = +INCLUDES = +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) ## Not yet for C, C++, and ObjC++ (too many warnings or not yet implemented) AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) @@ -28,7 +28,7 @@ nodist_man_MANS = check_PROGRAMS = TESTS = EXTRA_LIBRARIES = -EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h +EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h DISTCLEANFILES = $(EXTRA_LIBRARIES) CLEANFILES = TRIPTRAP = @@ -194,6 +194,10 @@ include $(srcdir)/synctexdir/am/synctex.am ## libmd5 include $(srcdir)/libmd5/am/md5.am +## Temporary +## +EXTRA_DIST += c-auto.h config.h + ## Eventually delete these files ## EXTRA_DIST += Makefile.in.orig configure.in.orig diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 45a8c811d24..8d1d5d157a5 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -222,7 +222,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = c-auto.h ff-config.h +CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h ff-config.h CONFIG_CLEAN_FILES = web2c-sh tangle-sh ctangleboot-sh CONFIG_CLEAN_VPATH_FILES = ARFLAGS = cru @@ -807,7 +807,7 @@ xetex_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_2) \ xetex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(xetex_CXXFLAGS) $(CXXFLAGS) \ $(xetex_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -1154,8 +1154,8 @@ wlibs = @wlibs@ x_ext_lib = @x_ext_lib@ x_tool_libs = @x_tool_libs@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -INCLUDES = $(KPATHSEA_INCLUDES) -AM_CPPFLAGS = +INCLUDES = +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS) @@ -1167,54 +1167,54 @@ nodist_man_MANS = EXTRA_LIBRARIES = libmf.a libmplib.a libpdftex.a liblua51.a \ libluasocket.a libluamisc.a libff.a libluatex.a libxetex.a \ libxetexmm.a libmd5.a -EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h triptrap-sh \ - tangle.web tangle.ch tangleboot.pin cwebdir ctangleboot.cin \ - cwebboot.cin cwebboot.hin tangle.test $(web_programs:=.web) \ - $(web_programs:=.ch) $(web_tests) tests/memdata1.bst \ - tests/memdata2.bst tests/memdata3.bst tests/allbib.aux \ - tests/allbib.tex tests/apalike.bst tests/batch.tex \ - tests/check.log tests/cmr10.600gf tests/cmr10.pk \ - tests/cmr10.pl tests/cmr10.tfm tests/cmr7.tfm tests/cmr8.tfm \ - tests/cmti10.tfm tests/cmtt10.tfm tests/cmtt8.tfm tests/dict \ - tests/eight.tex tests/end.tex tests/exampl.aux \ - tests/exampl.tex tests/gray.tfm tests/hello.tex tests/io.mf \ - tests/just.texi tests/label.mp tests/label.mpx tests/logo8.tfm \ - tests/longline.aux tests/longline.bib tests/longline.tex \ - tests/longtfm.tex tests/magic.tex tests/memtest.tex \ - tests/mltextst.tex tests/mptest.mp tests/mptest.mpx \ - tests/one.two.mf tests/one.two.mp tests/one.two.tex \ - tests/online.mf tests/openout.mp tests/openout.tex \ - tests/pagenum.dvi tests/pagenum.tex tests/patgen.in \ - tests/patterns tests/plain.mft tests/pplr.dvi tests/pplr.tfm \ - tests/ptmr.dvi tests/ptmr.tfm tests/ptmr.vf tests/ptmr.vpl \ - tests/rpsyr.tfm tests/rptmr.tfm tests/story.dvi \ - tests/testex.err tests/testex.mp tests/testex.tex \ - tests/translate tests/uno.dos tests/xampl.bib ctiedir tiedir \ - lib/mfmpi386.asm lib/mfmpw32.c lib/texmfmp.c texmfmem.h \ - texmfmp-help.h texmfmp.h $(tex_ch_srcs) lib/texmfmp.c \ - $(tex_tests) tests/write18-quote.tex $(mf_ch_src) mftalk.h \ - lib/texmfmp.c $(mf_tests) triptrap/README \ - triptrap/mftrap.diffs triptrap/mftrap.fot triptrap/mftrap.log \ - triptrap/mftrap.pl triptrap/mftrap1.in triptrap/mftrap2.in \ - triptrap/mftrapin.log triptrap/mptrap.diffs \ - triptrap/mptrap.fot triptrap/mptrap.log triptrap/mptrap.pl \ - triptrap/mptrap.readme triptrap/mptrap1.in triptrap/mptrap2.in \ - triptrap/mptrapin.log triptrap/mtrap.0 triptrap/mtrap.1 \ - triptrap/mtrap.log triptrap/mtrap.mp triptrap/texmf.cnf \ - triptrap/trap.148 triptrap/trap.149 triptrap/trap.150 \ - triptrap/trap.151 triptrap/trap.197 triptrap/trap.200 \ - triptrap/trap.5 triptrap/trap.6 triptrap/trap.mf \ - triptrap/trap.mp triptrap/trap.mpx triptrap/trap.typ \ - triptrap/trapf.pl triptrap/trapman.tex triptrap/trip.diffs \ - triptrap/trip.fot triptrap/trip.log triptrap/trip.pl \ - triptrap/trip.tex triptrap/trip.typ triptrap/trip1.in \ - 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/etexextra.in lib/texmfmp.c etexdir/ChangeLog \ - etexdir/INSTALL etexdir/README etexdir/etex_gen.tex \ - $(etex_tests) etexdir/etrip/etrip.diffs \ +EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ + triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \ + ctangleboot.cin cwebboot.cin cwebboot.hin tangle.test \ + $(web_programs:=.web) $(web_programs:=.ch) $(web_tests) \ + tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \ + tests/allbib.aux tests/allbib.tex tests/apalike.bst \ + tests/batch.tex tests/check.log tests/cmr10.600gf \ + tests/cmr10.pk tests/cmr10.pl tests/cmr10.tfm tests/cmr7.tfm \ + tests/cmr8.tfm tests/cmti10.tfm tests/cmtt10.tfm \ + tests/cmtt8.tfm tests/dict tests/eight.tex tests/end.tex \ + tests/exampl.aux tests/exampl.tex tests/gray.tfm \ + tests/hello.tex tests/io.mf tests/just.texi tests/label.mp \ + tests/label.mpx tests/logo8.tfm tests/longline.aux \ + tests/longline.bib tests/longline.tex tests/longtfm.tex \ + tests/magic.tex tests/memtest.tex tests/mltextst.tex \ + tests/mptest.mp tests/mptest.mpx tests/one.two.mf \ + tests/one.two.mp tests/one.two.tex tests/online.mf \ + tests/openout.mp tests/openout.tex tests/pagenum.dvi \ + tests/pagenum.tex tests/patgen.in tests/patterns \ + tests/plain.mft tests/pplr.dvi tests/pplr.tfm tests/ptmr.dvi \ + tests/ptmr.tfm tests/ptmr.vf tests/ptmr.vpl tests/rpsyr.tfm \ + tests/rptmr.tfm tests/story.dvi tests/testex.err \ + tests/testex.mp tests/testex.tex tests/translate tests/uno.dos \ + tests/xampl.bib ctiedir tiedir lib/mfmpi386.asm lib/mfmpw32.c \ + lib/texmfmp.c texmfmem.h texmfmp-help.h texmfmp.h \ + $(tex_ch_srcs) lib/texmfmp.c $(tex_tests) \ + tests/write18-quote.tex $(mf_ch_src) mftalk.h lib/texmfmp.c \ + $(mf_tests) triptrap/README triptrap/mftrap.diffs \ + triptrap/mftrap.fot triptrap/mftrap.log triptrap/mftrap.pl \ + triptrap/mftrap1.in triptrap/mftrap2.in triptrap/mftrapin.log \ + triptrap/mptrap.diffs triptrap/mptrap.fot triptrap/mptrap.log \ + triptrap/mptrap.pl triptrap/mptrap.readme triptrap/mptrap1.in \ + triptrap/mptrap2.in triptrap/mptrapin.log triptrap/mtrap.0 \ + triptrap/mtrap.1 triptrap/mtrap.log triptrap/mtrap.mp \ + triptrap/texmf.cnf triptrap/trap.148 triptrap/trap.149 \ + triptrap/trap.150 triptrap/trap.151 triptrap/trap.197 \ + triptrap/trap.200 triptrap/trap.5 triptrap/trap.6 \ + triptrap/trap.mf triptrap/trap.mp triptrap/trap.mpx \ + triptrap/trap.typ triptrap/trapf.pl triptrap/trapman.tex \ + triptrap/trip.diffs triptrap/trip.fot triptrap/trip.log \ + triptrap/trip.pl triptrap/trip.tex triptrap/trip.typ \ + triptrap/trip1.in 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/etexextra.in lib/texmfmp.c \ + etexdir/ChangeLog etexdir/INSTALL etexdir/README \ + etexdir/etex_gen.tex $(etex_tests) 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 \ @@ -1381,7 +1381,8 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h triptrap-sh \ synctexdir/synctex-e-rec.ch0 synctexdir/synctex-e-rec.ch1 \ synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \ synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \ - libmd5/md5.test Makefile.in.orig configure.in.orig + libmd5/md5.test c-auto.h config.h Makefile.in.orig \ + configure.in.orig DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ tangle-web2c tangleboot.c tangleboot.h tangleboot.p \ tangleboot-web2c ctangle.c cweb.c cweb.h ctangle-ctangle \ @@ -1513,9 +1514,9 @@ ctie_CFLAGS = $(WARNING_CFLAGS) nodist_cweave_SOURCES = cweave.c cweb.c cweave_CFLAGS = $(WARNING_CFLAGS) nodist_tie_SOURCES = tie.c -tie_CPPFLAGS = -DNOT_WEB2C +tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C tie_CFLAGS = $(WARNING_CFLAGS) -tex_CPPFLAGS = $(am__append_47) +tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_47) tex_CFLAGS = $(WARNING_CFLAGS) # With --enable-ipc, TeX may need to link with -lsocket. @@ -1538,11 +1539,11 @@ tex_ch_srcs = \ # tex_tests = trip.test tests/write18-quote-test.pl nodist_mf_SOURCES = mfextra.c -mf_CPPFLAGS = $(X_CFLAGS) +mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) mf_CFLAGS = $(WARNING_CFLAGS) mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) nodist_mf_nowin_SOURCES = mfextra.c -mf_nowin_CPPFLAGS = $(X_CFLAGS) -DMFNOWIN +mf_nowin_CPPFLAGS = $(mf_CPPFLAGS) -DMFNOWIN mf_nowin_CFLAGS = $(WARNING_CFLAGS) mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib) windowlib = window/libwindow.a @@ -1569,7 +1570,7 @@ mf_ch_src = \ # Metafont tests # mf_tests = trap.test -mpost_CPPFLAGS = -I$(srcdir)/mplibdir +mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir mpost_CFLAGS = $(WARNING_CFLAGS) mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm @@ -1582,7 +1583,7 @@ nodist_mpost_SOURCES = mpost.c $(mpxout_c_h) mpxout_c_h = mpxout.c mpxout.h mpost_web = mplibdir/mpost.w mplibdir/mpxout.w mp_tests = mplibdir/dvitomp.test mplibdir/mptrap.test -libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir +libmplib_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir libmplib_a_CFLAGS = $(WARNING_CFLAGS) libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c nodist_libmplib_a_SOURCES = $(memio_c_h) $(mp_c_h) $(psout_c_h) $(svgout_c_h) $(tfmin_c_h) @@ -1593,7 +1594,7 @@ svgout_c_h = mplibsvg.h mpsvgout.h svgout.c tfmin_c_h = mptfmin.h tfmin.c libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \ mplibdir/memio.w mplibdir/tfmin.w -etex_CPPFLAGS = $(am__append_51) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_51) etex_CFLAGS = $(WARNING_CFLAGS) # With --enable-ipc, e-TeX may need to link with -lsocket. @@ -1623,7 +1624,7 @@ etex_ch_srcs = \ # e-TeX Tests # etex_tests = etexdir/etrip.test -ptex_cppflags = $(PTEXENC_INCLUDES) +ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) ptex_ldadd = $(pproglib) $(PTEXENC_LIBS) $(LDADD) p_tangle = WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE) pweb_programs = pbibtex pdvitype ppltotf ptftopl @@ -1673,8 +1674,8 @@ nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h ptftopl_SOURCES = ptexdir/kanji.h ptftopl_CPPFLAGS = $(ptex_cppflags) ptftopl_LDADD = $(ptex_ldadd) -pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \ - $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ +pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \ + $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ -I$(srcdir)/pdftexdir # used for both pdftex and pdftosrc. @@ -1721,7 +1722,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \ EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \ pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \ pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c -ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir +ttf2afm_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/pdftexdir ttf2afm_CFLAGS = $(WARNING_CFLAGS) ttf2afm_SOURCES = pdftexdir/ttf2afm.c ttf2afm_DEPENDENCIES = $(default_dependencies) @@ -1737,9 +1738,9 @@ pdftosrc_DEPENDENCIES = $(pdftex_dependencies) # Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx -luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \ - $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 -Iluatexdir \ - -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \ +luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \ + $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ + -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \ -I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H` luatex_CFLAGS = $(WARNING_CFLAGS) luatex_CXXFLAGS = $(WARNING_CXXFLAGS) @@ -1878,6 +1879,7 @@ libluamisc_a_SOURCES = \ EXTRA_libluamisc_a_SOURCES = luatexdir/slnunicode/slnudata.c libff_a_DEPENDENCIES = libluamisc.a libff_a_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 \ -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 -DNODYNAMIC=1 \ -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 -UHAVE_LIBINTL_H \ @@ -1987,10 +1989,10 @@ libff_a_SOURCES = \ luatexdir/luafontloader/src/luafflib.c libluatex_a_DEPENDENCIES = libff.a -libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \ - $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ - -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \ - -DpdfTeX +libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \ + $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) \ + -I$(srcdir)/libmd5 -Iluatexdir -I$(srcdir)/luatexdir \ + -I$(srcdir)/luatexdir/lua51 -DpdfTeX libluatex_a_CFLAGS = $(WARNING_CFLAGS) libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) luatex_dvi_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/dvi $(ctangle) @@ -2183,7 +2185,7 @@ libluatex_a_SOURCES = \ # Force Automake to use CXXLD for linking nodist_EXTRA_xetex_SOURCES = dummy.cxx libxetex = libxetex.a $(am__append_31) -xetex_cppflags = -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ +xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_30) \ $(am__append_32) $(am__append_35) $(ZLIB_INCLUDES) xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_33) \ @@ -2401,7 +2403,7 @@ md5main_CPPFLAGS = -I$(srcdir)/libmd5 md5main_CFLAGS = $(WARNING_CFLAGS) md5main_SOURCES = libmd5/md5main.c md5main_LDADD = libmd5.a -all: c-auto.h ff-config.h +all: ff-config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: @@ -2440,18 +2442,18 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -c-auto.h: stamp-h1 +w2c/c-auto.h: w2c/stamp-h1 @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + rm -f w2c/stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) w2c/stamp-h1; \ else :; fi -stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status c-auto.h +w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status + @rm -f w2c/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h $(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 + rm -f w2c/stamp-h1 touch $@ ff-config.h: stamp-h2 @@ -2465,7 +2467,7 @@ stamp-h2: $(top_srcdir)/luatexdir/luafontloader/ff-config.in $(top_builddir)/con cd $(top_builddir) && $(SHELL) ./config.status ff-config.h distclean-hdr: - -rm -f c-auto.h stamp-h1 ff-config.h stamp-h2 + -rm -f w2c/c-auto.h w2c/stamp-h1 ff-config.h stamp-h2 web2c-sh: $(top_builddir)/config.status $(srcdir)/web2c-sh.in cd $(top_builddir) && $(SHELL) ./config.status $@ tangle-sh: $(top_builddir)/config.status $(srcdir)/tangle-sh.in @@ -8507,7 +8509,7 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-recursive -all-am: Makefile $(PROGRAMS) $(MANS) c-auto.h ff-config.h +all-am: Makefile $(PROGRAMS) $(MANS) ff-config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \ diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am index f7674eef57b..cba361919ce 100644 --- a/Build/source/texk/web2c/am/cweb.am +++ b/Build/source/texk/web2c/am/cweb.am @@ -22,7 +22,7 @@ cweave.c: ctangle$(EXEEXT) cwebdir/common.h cwebdir/cweave.w cwebdir/prod.w cweb DISTCLEANFILES += cweave.c nodist_tie_SOURCES = tie.c -tie_CPPFLAGS = -DNOT_WEB2C +tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C tie_CFLAGS = $(WARNING_CFLAGS) ## We install man/tie.man, not tiedir/tie.1 ## nodist_man_MANS += tiedir/tie.1 diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index b88acb3707e..7c16c38e6f8 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -19,7 +19,7 @@ bin_PROGRAMS += tex endif TEX EXTRA_PROGRAMS += tex -tex_CPPFLAGS = +tex_CPPFLAGS = $(AM_CPPFLAGS) tex_CFLAGS = $(WARNING_CFLAGS) # With --enable-ipc, TeX may need to link with -lsocket. @@ -97,11 +97,11 @@ EXTRA_PROGRAMS += mf mf-nowin DISTCLEANFILES += mftrap.diffs nodist_mf_SOURCES = mfextra.c -mf_CPPFLAGS = $(X_CFLAGS) +mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) mf_CFLAGS = $(WARNING_CFLAGS) mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) nodist_mf_nowin_SOURCES = mfextra.c -mf_nowin_CPPFLAGS = $(X_CFLAGS) -DMFNOWIN +mf_nowin_CPPFLAGS = $(mf_CPPFLAGS) -DMFNOWIN mf_nowin_CFLAGS = $(WARNING_CFLAGS) mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib) diff --git a/Build/source/texk/web2c/c-auto.h b/Build/source/texk/web2c/c-auto.h new file mode 100644 index 00000000000..0e33f8eba7b --- /dev/null +++ b/Build/source/texk/web2c/c-auto.h @@ -0,0 +1,4 @@ +/* FIXME: This file is needed temporarily until the files + * luatexdir/image/epdf.h and luatexdir/lua51/luaconf.h + * include <w2c/c-auto.h> instead if <c-auto.h> or "c-auto.h". */ +#include <w2c/c-auto.h> diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in index f8c83a11928..423a459707b 100644 --- a/Build/source/texk/web2c/c-auto.in +++ b/Build/source/texk/web2c/c-auto.in @@ -1,6 +1,6 @@ /* c-auto.in. Generated from configure.ac by autoheader. */ -/* c-auto.h: defines for web2c, as determined by configure. +/* w2c/c-auto.h: defines for web2c, as determined by configure. Copyright 1994-97, 2008, 2009, 2010 Karl Berry. Copyright 1997-99, 2002, 2005 Olaf Weber. diff --git a/Build/source/texk/web2c/config.h b/Build/source/texk/web2c/config.h index 2b4fe7316fc..fc925f52abd 100644 --- a/Build/source/texk/web2c/config.h +++ b/Build/source/texk/web2c/config.h @@ -1,116 +1,4 @@ -/* config.h: All .c files include this first. - -Copyright 1995, 1996, 2006, 2007, 2009 Karl Berry. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, see <http://www.gnu.org/licenses/. */ - -#ifndef WEB2C_CONFIG_H -#define WEB2C_CONFIG_H - -/* The stuff from the path searching library. */ -#include <kpathsea/config.h> -#include <c-auto.h> -#include <stdarg.h> - -/* How to open a binary file. */ -#include <kpathsea/c-fopen.h> - -/* The smallest signed type: use `signed char' if ANSI C, `short' if - char is unsigned, otherwise `char'. */ -#ifndef SCHAR_TYPE -#if __STDC__ -#define SCHAR_TYPE signed char -#else /* not __STDC */ -#ifdef __CHAR_UNSIGNED__ -#define SCHAR_TYPE short -#else -#define SCHAR_TYPE char -#endif -#endif /* not __STDC__ */ -#endif /* not SCHAR_TYPE */ -typedef SCHAR_TYPE schar; - -/* The type `integer' must be a signed integer capable of holding at - least the range of numbers (-2^31)..(2^31-1). If your compiler goes - to great lengths to make programs fail, you might have to change this - definition. If this changes, you may have to modify - web2c/fixwrites.c, since it generates code to do integer output using - "%ld", and casts all integral values to be printed to `long'. - - If you define your own INTEGER_TYPE, you have to define your own - INTEGER_MAX and INTEGER_MIN, too. */ -#ifndef INTEGER_TYPE - -#if SIZEOF_LONG > 4 && !defined (NO_DUMP_SHARE) -/* If we have 64-bit longs and want to share format files (with 32-bit - machines), use `int'. */ -#define INTEGER_IS_INT -#endif - -#ifdef INTEGER_IS_INT -#define INTEGER_TYPE int -#define INTEGER_MAX INT_MAX -#define INTEGER_MIN INT_MIN -#else -#define INTEGER_TYPE long -#define INTEGER_MAX LONG_MAX -#define INTEGER_MIN LONG_MIN -#endif /* not INTEGER_IS_INT */ - -#endif /* not INTEGER_TYPE */ - -typedef INTEGER_TYPE integer; - -/* We need a type that's at least off_t wide */ -typedef off_t longinteger; - - -/* I don't want to write a configure test for remove when all Unix - machines have unlink. But, for the sake of non-Unix machines that - support ANSI C... */ -#if !defined (unix) && !defined (__unix__) && defined (__STDC__) && !defined (unlink) -#define unlink remove -#endif - -/* Window support on the Amiga is just for the Amiga. */ -#ifdef AMIGA -#define AMIGAWIN -#endif - -/* Window support for WIN32 machines. */ -#ifdef WIN32 -#define WIN32WIN -#endif - -/* strtol.c */ -#ifndef HAVE_STRTOL -extern long strtol (const char *, char **, int); -#endif - -#if defined __GNUC__ && __GNUC__ >=3 -#define WEB2C_NORETURN __attribute__((__noreturn__)) -#else -#define WEB2C_NORETURN -#endif - -/* From uexit.c. This is here because the lib/ and web2c/ routines - themselves can use it, but they don't need cpascal.h. */ -WEB2C_NORETURN -extern void uexit (int status); - -/* usage.c */ -extern void usage (const_string progname); -extern void usagehelp (const_string *message, const_string bug_email); - -#endif /* not WEB2C_CONFIG_H */ +/* FIXME: This file is needed temporarily until all + * luatexdir/ and mplibdir/ files + * include <w2c/config.h> instead if <config.h> or "config.h". */ +#include <w2c/config.h> diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 94303351d33..1bec9b4d3c9 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -21655,7 +21655,7 @@ CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS -ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" +ac_config_headers="$ac_config_headers w2c/c-auto.h:c-auto.in" @@ -23200,7 +23200,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;; - "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;; + "w2c/c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS w2c/c-auto.h:c-auto.in" ;; "ff-config.h") CONFIG_HEADERS="$CONFIG_HEADERS ff-config.h:luatexdir/luafontloader/ff-config.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; @@ -24710,8 +24710,9 @@ if test "x$enable_libtool_hack" = xyes; then fi ;; "CXXLD.sh":C) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;; - "c-auto.h":H) sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \ - -e 's/^#define VERSION/#define WEB2C_VERSION/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h ;; + "w2c/c-auto.h":H) sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \ + -e 's/^#define VERSION/#define WEB2C_VERSION/' w2c/c-auto.h >c-auto.tmp \ + && mv -f c-auto.tmp w2c/c-auto.h ;; "web2c-sh":F) chmod +x web2c-sh ;; "tangle-sh":F) chmod +x tangle-sh ;; "ctangleboot-sh":F) chmod +x ctangleboot-sh ;; diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 2a402fc1915..85a0f4eafa7 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -272,11 +272,12 @@ AC_LANG_POP([C++]) KPSE_RESTORE_FLAGS dnl Write output here, instead of putting a zillion -D's on the command line. -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], +AC_CONFIG_HEADERS([w2c/c-auto.h:c-auto.in], [sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \ - -e 's/^#define VERSION/#define WEB2C_VERSION/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h]) + -e 's/^#define VERSION/#define WEB2C_VERSION/' w2c/c-auto.h >c-auto.tmp \ + && mv -f c-auto.tmp w2c/c-auto.h]) -AH_TOP([/* c-auto.h: defines for web2c, as determined by configure. +AH_TOP([/* w2c/c-auto.h: defines for web2c, as determined by configure. Copyright 1994-97, 2008, 2009, 2010 Karl Berry. Copyright 1997-99, 2002, 2005 Olaf Weber. diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h index a4b5976d295..9064e3ce1ed 100644 --- a/Build/source/texk/web2c/cpascal.h +++ b/Build/source/texk/web2c/cpascal.h @@ -13,7 +13,7 @@ #endif /* We must include this first, to resolve many C issues. */ -#include "config.h" +#include <w2c/config.h> /* We only use getopt in the applications, not in web2c itself. */ #include <kpathsea/getopt.h> diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index b1efff5d376..96f8d3f8e1a 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -70,7 +70,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h +CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \ + $(top_builddir)/ff-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index d2456663b40..9f8d67b3668 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am (etex_CPPFLAGS): Add $(AM_CPPFLAGS). + 2010-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> * am/etex.am (EXTRA_DIST): Remove tmf-pool.h. diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 993f6bb411b..61b2146efce 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -10,7 +10,7 @@ bin_PROGRAMS += etex endif ETEX EXTRA_PROGRAMS += etex -etex_CPPFLAGS = +etex_CPPFLAGS = $(AM_CPPFLAGS) etex_CFLAGS = $(WARNING_CFLAGS) # With --enable-ipc, e-TeX may need to link with -lsocket. diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 07ee30e6e1a..ab7256a8aa4 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,13 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * alloca.c, basechsuffix.c, chartostring.c, coredump.c, + eofeoln.c, fprintreal.c, input2int.c, inputint.c, main.c, + openclose.c, printversion.c, setupvar.c, uexit.c, usage.c, + zround.c: + #include <w2c/config.h> instead of <config.h> or "config.h". + * version.c: #include <w2c/c-auto.h> instead of "c-auto.h". + 2010-06-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * texmfmp.c: include kpathsea/concatn.h if WIN32 is defined. diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 2123cb28f36..d3c6df6a9e6 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -72,7 +72,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h +CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \ + $(top_builddir)/ff-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) @@ -91,7 +92,7 @@ libp_a_LIBADD = am_libp_a_OBJECTS = libp_a-openclose.$(OBJEXT) \ libp_a-printversion.$(OBJEXT) libp_a_OBJECTS = $(am_libp_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f diff --git a/Build/source/texk/web2c/lib/alloca.c b/Build/source/texk/web2c/lib/alloca.c index 385793295fe..1e48c11c505 100644 --- a/Build/source/texk/web2c/lib/alloca.c +++ b/Build/source/texk/web2c/lib/alloca.c @@ -22,7 +22,7 @@ your main control loop, etc. to force garbage collection. */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <w2c/config.h> #endif #ifdef HAVE_STRING_H diff --git a/Build/source/texk/web2c/lib/basechsuffix.c b/Build/source/texk/web2c/lib/basechsuffix.c index 2b1e9554eab..cd17d5c45ac 100644 --- a/Build/source/texk/web2c/lib/basechsuffix.c +++ b/Build/source/texk/web2c/lib/basechsuffix.c @@ -2,7 +2,7 @@ Written in 1995 by Karl Berry. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" /* Return the basename of NAME, with trailing characters OLD replaced by diff --git a/Build/source/texk/web2c/lib/chartostring.c b/Build/source/texk/web2c/lib/chartostring.c index fe3b88d52d1..7b34e694241 100644 --- a/Build/source/texk/web2c/lib/chartostring.c +++ b/Build/source/texk/web2c/lib/chartostring.c @@ -3,7 +3,7 @@ Written in 1994 by Karl Berry. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" /* This is needed because web2c turns the Pascal construct 'x' into the diff --git a/Build/source/texk/web2c/lib/coredump.c b/Build/source/texk/web2c/lib/coredump.c index c89d6732931..cf883bf7166 100644 --- a/Build/source/texk/web2c/lib/coredump.c +++ b/Build/source/texk/web2c/lib/coredump.c @@ -8,7 +8,7 @@ reconstitute the core dump into a binary (i.e., with undump) is up to you. Perl has some things to say about these days. */ -#include "config.h" +#include <w2c/config.h> /* Do not try to compile this Unix-y unportable stuff unless it's needed. */ diff --git a/Build/source/texk/web2c/lib/eofeoln.c b/Build/source/texk/web2c/lib/eofeoln.c index c584f5da138..457bbfca41c 100644 --- a/Build/source/texk/web2c/lib/eofeoln.c +++ b/Build/source/texk/web2c/lib/eofeoln.c @@ -1,7 +1,7 @@ /* eofeoln.c: implement Pascal's ideas for end-of-file and end-of-line testing. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" /* Return true if we're at the end of FILE, else false. This implements diff --git a/Build/source/texk/web2c/lib/fprintreal.c b/Build/source/texk/web2c/lib/fprintreal.c index 27424b3d470..c65e4b277ff 100644 --- a/Build/source/texk/web2c/lib/fprintreal.c +++ b/Build/source/texk/web2c/lib/fprintreal.c @@ -1,7 +1,7 @@ /* fprintreal.c: print the real number R in the Pascal format N:M on the file F. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" void diff --git a/Build/source/texk/web2c/lib/input2int.c b/Build/source/texk/web2c/lib/input2int.c index 2726601a487..5bd42016b4e 100644 --- a/Build/source/texk/web2c/lib/input2int.c +++ b/Build/source/texk/web2c/lib/input2int.c @@ -1,7 +1,7 @@ /* input2int.c: read two or three integers from text files. These routines are only used in patgen. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" #ifdef INTEGER_IS_INT diff --git a/Build/source/texk/web2c/lib/inputint.c b/Build/source/texk/web2c/lib/inputint.c index 7b2dd58704d..d27bb6a148c 100644 --- a/Build/source/texk/web2c/lib/inputint.c +++ b/Build/source/texk/web2c/lib/inputint.c @@ -2,7 +2,7 @@ used for debugging and such, so perfect error checking isn't necessary. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" /* Read an integer from the file F, reading past the subsequent end of diff --git a/Build/source/texk/web2c/lib/main.c b/Build/source/texk/web2c/lib/main.c index 654491e6a07..6d11dc96a37 100644 --- a/Build/source/texk/web2c/lib/main.c +++ b/Build/source/texk/web2c/lib/main.c @@ -1,7 +1,7 @@ /* main.c -- the main program for everything but TeX & MF. */ /* Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" /* These variables are referenced from the change files. */ diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c index a0d5f0bb35a..dc2393a8746 100644 --- a/Build/source/texk/web2c/lib/openclose.c +++ b/Build/source/texk/web2c/lib/openclose.c @@ -2,7 +2,7 @@ Written 1995 Karl Berry. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" #include <kpathsea/c-pathch.h> #include <kpathsea/tex-file.h> diff --git a/Build/source/texk/web2c/lib/printversion.c b/Build/source/texk/web2c/lib/printversion.c index fde4d43fe04..5d44a0f556f 100644 --- a/Build/source/texk/web2c/lib/printversion.c +++ b/Build/source/texk/web2c/lib/printversion.c @@ -2,7 +2,7 @@ Written in 1996 by Karl Berry. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" #include <kpathsea/version.h> #ifdef PTEX diff --git a/Build/source/texk/web2c/lib/setupvar.c b/Build/source/texk/web2c/lib/setupvar.c index 5fb37062d08..702d379689a 100644 --- a/Build/source/texk/web2c/lib/setupvar.c +++ b/Build/source/texk/web2c/lib/setupvar.c @@ -3,7 +3,7 @@ Adapted in 2010 by Peter Breitenlohner. Public domain. Written in 1995 by Karl Berry. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" #include <kpathsea/variable.h> diff --git a/Build/source/texk/web2c/lib/uexit.c b/Build/source/texk/web2c/lib/uexit.c index 744c298d413..90a4d9f76a4 100644 --- a/Build/source/texk/web2c/lib/uexit.c +++ b/Build/source/texk/web2c/lib/uexit.c @@ -2,7 +2,7 @@ just call `exit' from the web files, since the webs use `exit' as a loop label. Public domain. */ -#include "config.h" +#include <w2c/config.h> void uexit (int unix_code) diff --git a/Build/source/texk/web2c/lib/usage.c b/Build/source/texk/web2c/lib/usage.c index c09ee874fce..4c6bc5bbe0a 100644 --- a/Build/source/texk/web2c/lib/usage.c +++ b/Build/source/texk/web2c/lib/usage.c @@ -3,7 +3,7 @@ Modified in 2001 by O. Weber. Written in 1995 by K. Berry. Public domain. */ -#include "config.h" +#include <w2c/config.h> /* Call usage if the program exits with an "usage error". STR is supposed to be the program name. */ diff --git a/Build/source/texk/web2c/lib/version.c b/Build/source/texk/web2c/lib/version.c index 40f8cf4db12..054b0abc0be 100644 --- a/Build/source/texk/web2c/lib/version.c +++ b/Build/source/texk/web2c/lib/version.c @@ -1,4 +1,4 @@ -#include "c-auto.h" +#include <w2c/c-auto.h> /* This string is appended to all the banners and used in --version. */ /* Public domain. */ diff --git a/Build/source/texk/web2c/lib/zround.c b/Build/source/texk/web2c/lib/zround.c index a72626cb0a5..e51eed8fa2a 100644 --- a/Build/source/texk/web2c/lib/zround.c +++ b/Build/source/texk/web2c/lib/zround.c @@ -1,7 +1,7 @@ /* zround.c: round R to the nearest whole number. This is supposed to implement the predefined Pascal round function. Public domain. */ -#include "config.h" +#include <w2c/config.h> #include "lib.h" integer diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 53f6a4f99ee..2ad4cc34f35 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,4 +1,11 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libluatex.am (libluatex_a_CPPFLAGS): Add $(AM_CPPFLAGS). + * am/luafontforge.am (libff_a_CPPFLAGS): Add $(AM_CPPFLAGS). + * am/luatex.am (luatex_CPPFLAGS): Add $(AM_CPPFLAGS). + 2010-06-10 Taco Hoekwater <taco@luatex.org> + * luasocket/src/options.c, luafontloader/fontforge/fontforge/parsettfatt.c, luafontloader/fontforge/fontforge/parsettf.c, luafontloader/fontforge/fontforge/lookups.c: enlarge static buffers diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 416c7716478..6e26ee981f1 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -9,8 +9,8 @@ EXTRA_LIBRARIES += libluatex.a libluatex_a_DEPENDENCIES = libff.a -libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) -libluatex_a_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 +libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) +libluatex_a_CPPFLAGS += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 libluatex_a_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 libluatex_a_CPPFLAGS += -DpdfTeX libluatex_a_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am index 8f1770d07d6..5f90b53b5b7 100644 --- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am +++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am @@ -12,6 +12,7 @@ libff_a_DEPENDENCIES = libluamisc.a $(libff_a_OBJECTS): $(libff_a_DEPENDENCIES) libff_a_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 \ -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 -DNODYNAMIC=1 \ -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 -UHAVE_LIBINTL_H \ diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index 1a4db3ec15b..01f7873684a 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -13,8 +13,8 @@ EXTRA_PROGRAMS += luatex # Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx -luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) -luatex_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 +luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) +luatex_CPPFLAGS += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 luatex_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H` luatex_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index d582fdb1d07..fcb08bb7af1 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -84,7 +84,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h +CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \ + $(top_builddir)/ff-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 7269d232d42..6de9066565d 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,4 +1,10 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libmplib.am (libmplib_a_CPPFLAGS): Add $(AM_CPPFLAGS). + * am/mplib.am (mpost_CPPFLAGS): Add $(AM_CPPFLAGS). + 2010-05-31 Taco Hoekwater <taco@luatex.org> + * mp.w (mp_set_output_file_name): prevent reallocation of string pool during output file name generation. diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am index 57bd47dae53..c2cfc416272 100644 --- a/Build/source/texk/web2c/mplibdir/am/libmplib.am +++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am @@ -1,13 +1,13 @@ ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## libmplib.a, used by MetaPost and luaTeX ## EXTRA_LIBRARIES += libmplib.a -libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir +libmplib_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir libmplib_a_CFLAGS = $(WARNING_CFLAGS) ## libmplib C sources diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 483a895046e..ad5a112d54d 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -10,7 +10,7 @@ bin_PROGRAMS += mpost endif MP EXTRA_PROGRAMS += mpost -mpost_CPPFLAGS = -I$(srcdir)/mplibdir +mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir mpost_CFLAGS = $(WARNING_CFLAGS) mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 4ae785760b4..c7a335ae3a9 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -74,7 +74,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h +CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \ + $(top_builddir)/ff-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @OMFONTS_TRUE@@OTANGLE_TRUE@am__EXEEXT_1 = omfonts$(EXEEXT) @@ -91,7 +92,7 @@ am_omfonts_OBJECTS = char_routines.$(OBJEXT) dimen_routines.$(OBJEXT) \ omfonts_OBJECTS = $(am_omfonts_OBJECTS) omfonts_LDADD = $(LDADD) am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f diff --git a/Build/source/texk/web2c/otps/ChangeLog b/Build/source/texk/web2c/otps/ChangeLog index a9c8bb57d51..25db1daa690 100644 --- a/Build/source/texk/web2c/otps/ChangeLog +++ b/Build/source/texk/web2c/otps/ChangeLog @@ -1,3 +1,8 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * routines.h: #include <w2c/config.h> instead of <config.h>. + 2010-04-07 Peter Breitenlohner <peb@mppmu.mpg.de> * mkocp.man, mkofm.man, otp2ocp.man, outocp.man: diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index a78c75222d5..7dbb5d7d9a4 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -76,7 +76,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h +CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \ + $(top_builddir)/ff-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = otp2ocp$(EXEEXT) outocp$(EXEEXT) @@ -113,7 +114,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f diff --git a/Build/source/texk/web2c/otps/routines.h b/Build/source/texk/web2c/otps/routines.h index 6d99dcd906f..a0e4485dc3a 100644 --- a/Build/source/texk/web2c/otps/routines.h +++ b/Build/source/texk/web2c/otps/routines.h @@ -23,7 +23,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc., */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <w2c/config.h> #endif #ifdef KPATHSEA #include <kpathsea/config.h> diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 25f2aa8bae1..ac5b90bb222 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,14 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/pdftex.am (pdftex_cppflags): Add $(AM_CPPFLAGS). + * am/ttf2afm.am (ttf2afm_CPPFLAGS): Add $(AM_CPPFLAGS). + +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * pdftoepdf.cc: #include <w2c/c-auto.h> instead of <c-auto.h> + and <w2c/config.h> instead of "../config.h". + 2010-06-07 Karl Berry <karl@tug.org> * pdftex.web: (pdftex_version_string): let's be optimistic and diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index 6ebeb764cdf..446d4ff9d2b 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -3,9 +3,9 @@ ## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) -pdftex_cppflags += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 -pdftex_cppflags += -I$(srcdir)/pdftexdir +pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) +pdftex_cppflags += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) +pdftex_cppflags += -I$(srcdir)/libmd5 -I$(srcdir)/pdftexdir # used for both pdftex and pdftosrc. pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) diff --git a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am index 12e31675c41..964a07fe26b 100644 --- a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am +++ b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am @@ -1,6 +1,6 @@ ## texk/web2c/pdftexdir/am/ttf2afm.am: Makefile fragment for ttf2afm. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ttf2afm @@ -10,7 +10,7 @@ bin_PROGRAMS += ttf2afm endif PDFTEX EXTRA_PROGRAMS += ttf2afm -ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir +ttf2afm_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/pdftexdir ttf2afm_CFLAGS = $(WARNING_CFLAGS) ttf2afm_SOURCES = pdftexdir/ttf2afm.c diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc index fca1ad4a08e..22f01978ab3 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc @@ -72,8 +72,8 @@ extern "C" { #include <kpathsea/c-proto.h> #include <kpathsea/lib.h> -#include <c-auto.h> /* define SIZEOF_LONG */ -#include "../config.h" /* define type integer */ +#include <w2c/c-auto.h> /* define SIZEOF_LONG */ +#include <w2c/config.h> /* define type integer */ #include <pdftexdir/ptexmac.h> #include <pdftexdir/pdftex-common.h> diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index c99b9ac35e1..ea2d8518bdb 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/ptex.am (ptex_cppflags): Add $(AM_CPPFLAGS). + 2010-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> * Files, pbibtex.defines, ptex.mk, ptex-base.ch.orig, diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 95470f82a63..320a1732ce0 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -3,7 +3,7 @@ ## Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -ptex_cppflags = $(PTEXENC_INCLUDES) +ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) ptex_ldadd = $(pproglib) $(PTEXENC_LIBS) $(LDADD) p_tangle = WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE) diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index 65d57a4efa3..e2bbf615052 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,9 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * synctex_main.c, synctex_parser_local.h: + #include <w2c/config.h> instead of "config.h". + 2010-05-13 Jerome Laurens <jerome.laurens@u-bourgogne.fr> * synctex.c, very minor change in code design to remove wrong warnings when building xetex. diff --git a/Build/source/texk/web2c/synctexdir/synctex_main.c b/Build/source/texk/web2c/synctexdir/synctex_main.c index 921e09fcd99..ff3b6794f9f 100644 --- a/Build/source/texk/web2c/synctexdir/synctex_main.c +++ b/Build/source/texk/web2c/synctexdir/synctex_main.c @@ -61,7 +61,7 @@ This is the command line interface to the synctex_parser.c. #define _ISOC99_SOURCE /* to get the fmax() prototype */ #endif -# include "c-auto.h" /* for inline && HAVE_xxx */ +# include <w2c/c-auto.h> /* for inline && HAVE_xxx */ # include <stdlib.h> # include <stdio.h> diff --git a/Build/source/texk/web2c/synctexdir/synctex_parser_local.h b/Build/source/texk/web2c/synctexdir/synctex_parser_local.h index d84f5ee051f..0a127afe86c 100644 --- a/Build/source/texk/web2c/synctexdir/synctex_parser_local.h +++ b/Build/source/texk/web2c/synctexdir/synctex_parser_local.h @@ -36,6 +36,6 @@ authorization from the copyright holder. */ /* This local header file is for TEXLIVE, use your own header to fit your system */ -# include "c-auto.h" /* for inline && HAVE_xxx */ +# include <w2c/c-auto.h> /* for inline && HAVE_xxx */ /* No inlining for synctex tool in texlive. */ # define SYNCTEX_INLINE diff --git a/Build/source/texk/web2c/w2c/config.h b/Build/source/texk/web2c/w2c/config.h new file mode 100644 index 00000000000..4d325139138 --- /dev/null +++ b/Build/source/texk/web2c/w2c/config.h @@ -0,0 +1,116 @@ +/* w2c/config.h: All .c files include this first. + +Copyright 1995, 1996, 2006, 2007, 2009, 2010 Karl Berry. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, see <http://www.gnu.org/licenses/. */ + +#ifndef WEB2C_CONFIG_H +#define WEB2C_CONFIG_H + +/* The stuff from the path searching library. */ +#include <kpathsea/config.h> +#include <w2c/c-auto.h> +#include <stdarg.h> + +/* How to open a binary file. */ +#include <kpathsea/c-fopen.h> + +/* The smallest signed type: use `signed char' if ANSI C, `short' if + char is unsigned, otherwise `char'. */ +#ifndef SCHAR_TYPE +#if __STDC__ +#define SCHAR_TYPE signed char +#else /* not __STDC */ +#ifdef __CHAR_UNSIGNED__ +#define SCHAR_TYPE short +#else +#define SCHAR_TYPE char +#endif +#endif /* not __STDC__ */ +#endif /* not SCHAR_TYPE */ +typedef SCHAR_TYPE schar; + +/* The type `integer' must be a signed integer capable of holding at + least the range of numbers (-2^31)..(2^31-1). If your compiler goes + to great lengths to make programs fail, you might have to change this + definition. If this changes, you may have to modify + web2c/fixwrites.c, since it generates code to do integer output using + "%ld", and casts all integral values to be printed to `long'. + + If you define your own INTEGER_TYPE, you have to define your own + INTEGER_MAX and INTEGER_MIN, too. */ +#ifndef INTEGER_TYPE + +#if SIZEOF_LONG > 4 && !defined (NO_DUMP_SHARE) +/* If we have 64-bit longs and want to share format files (with 32-bit + machines), use `int'. */ +#define INTEGER_IS_INT +#endif + +#ifdef INTEGER_IS_INT +#define INTEGER_TYPE int +#define INTEGER_MAX INT_MAX +#define INTEGER_MIN INT_MIN +#else +#define INTEGER_TYPE long +#define INTEGER_MAX LONG_MAX +#define INTEGER_MIN LONG_MIN +#endif /* not INTEGER_IS_INT */ + +#endif /* not INTEGER_TYPE */ + +typedef INTEGER_TYPE integer; + +/* We need a type that's at least off_t wide */ +typedef off_t longinteger; + + +/* I don't want to write a configure test for remove when all Unix + machines have unlink. But, for the sake of non-Unix machines that + support ANSI C... */ +#if !defined (unix) && !defined (__unix__) && defined (__STDC__) && !defined (unlink) +#define unlink remove +#endif + +/* Window support on the Amiga is just for the Amiga. */ +#ifdef AMIGA +#define AMIGAWIN +#endif + +/* Window support for WIN32 machines. */ +#ifdef WIN32 +#define WIN32WIN +#endif + +/* strtol.c */ +#ifndef HAVE_STRTOL +extern long strtol (const char *, char **, int); +#endif + +#if defined __GNUC__ && __GNUC__ >=3 +#define WEB2C_NORETURN __attribute__((__noreturn__)) +#else +#define WEB2C_NORETURN +#endif + +/* From uexit.c. This is here because the lib/ and web2c/ routines + themselves can use it, but they don't need cpascal.h. */ +WEB2C_NORETURN +extern void uexit (int status); + +/* usage.c */ +extern void usage (const_string progname); +extern void usagehelp (const_string *message, const_string bug_email); + +#endif /* not WEB2C_CONFIG_H */ diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog index 86f810be7d9..6f6a3e67287 100644 --- a/Build/source/texk/web2c/web2c/ChangeLog +++ b/Build/source/texk/web2c/web2c/ChangeLog @@ -1,3 +1,16 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * native/kpathsea/c-auto.in (deleted): Moved ... + * c-auto.in (new): ... to here. + * configure.ac: Create kpathsea/c-auto.h instead of + native/kpathsea/c-auto.h. + * Makefile.am: Create w2c/config.h instead of native/config.h. + Adjust INCLUDES, BUILT_SOURCES, DISTCLEANFILES, rules, and + dependencies. + * fixwrites.c, splitup.c, web2c.h: #include <w2c/config.h> + instead of "config.h". + 2010-04-26 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Make sure native/config.h exists before diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am index c9aec51b92d..087a39e7532 100644 --- a/Build/source/texk/web2c/web2c/Makefile.am +++ b/Build/source/texk/web2c/web2c/Makefile.am @@ -5,19 +5,20 @@ ## ACLOCAL_AMFLAGS = -I ../../../m4 -INCLUDES = -Inative -I$(srcdir)/native -I$(srcdir)/../.. +INCLUDES = -I$(srcdir)/../.. AM_YFLAGS = -d -v AM_CFLAGS = $(WARNING_CFLAGS) noinst_PROGRAMS = web2c fixwrites splitup makecpool -BUILT_SOURCES = native/config.h +BUILT_SOURCES = w2c/config.h -DISTCLEANFILES = native/config.h +DISTCLEANFILES = w2c/config.h # Don't include our <c-auto.h>. -native/config.h: ../config.h - sed -e '/<c-auto\.h>/d' $(srcdir)/../config.h >$@ +w2c/config.h: ../w2c/config.h + $(MKDIR_P) w2c + sed -e '/c-auto\.h>/d' $(srcdir)/../w2c/config.h >$@ noinst_HEADERS = coerce.h @@ -38,7 +39,7 @@ web2c_SOURCES = \ main.c \ web2c.h -$(web2c_OBJECTS): web2c-parser.h native/config.h +$(web2c_OBJECTS): web2c-parser.h w2c/config.h DISTCLEANFILES += web2c-parser.output @@ -46,13 +47,13 @@ fixwrites_SOURCES = \ fixwrites.c \ kps.c -$(fixwrites_OBJECTS): native/config.h +$(fixwrites_OBJECTS): w2c/config.h splitup_SOURCES = \ kps.c \ splitup.c -$(splitup_OBJECTS): native/config.h +$(splitup_OBJECTS): w2c/config.h makecpool_SOURCES = \ makecpool.c diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in index d8a7948b390..e1f8d282165 100644 --- a/Build/source/texk/web2c/web2c/Makefile.in +++ b/Build/source/texk/web2c/web2c/Makefile.in @@ -49,13 +49,13 @@ DIST_COMMON = README $(am__configure_deps) $(dist_noinst_DATA) \ $(srcdir)/../../../build-aux/ltmain.sh \ $(srcdir)/../../../build-aux/missing \ $(srcdir)/../../../build-aux/ylwrap $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ - $(top_srcdir)/native/kpathsea/c-auto.in \ - ../../../build-aux/config.guess ../../../build-aux/config.sub \ - ../../../build-aux/depcomp ../../../build-aux/install-sh \ - ../../../build-aux/ltmain.sh ../../../build-aux/missing \ - ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap \ - ChangeLog web2c-lexer.c web2c-parser.c web2c-parser.h + $(srcdir)/Makefile.in $(srcdir)/c-auto.in \ + $(top_srcdir)/configure ../../../build-aux/config.guess \ + ../../../build-aux/config.sub ../../../build-aux/depcomp \ + ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \ + ../../../build-aux/missing ../../../build-aux/texinfo.tex \ + ../../../build-aux/ylwrap ChangeLog web2c-lexer.c \ + web2c-parser.c web2c-parser.h ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \ $(top_srcdir)/../../../m4/kpse-lex.m4 \ @@ -71,7 +71,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/native/kpathsea/c-auto.h +CONFIG_HEADER = $(top_builddir)/kpathsea/c-auto.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) @@ -89,7 +89,7 @@ am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \ web2c_OBJECTS = $(am_web2c_OBJECTS) web2c_LDADD = $(LDADD) SCRIPTS = $(dist_noinst_SCRIPTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/native/kpathsea +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/kpathsea depcomp = $(SHELL) $(top_srcdir)/../../../build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -251,11 +251,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../../m4 -INCLUDES = -Inative -I$(srcdir)/native -I$(srcdir)/../.. +INCLUDES = -I$(srcdir)/../.. AM_YFLAGS = -d -v AM_CFLAGS = $(WARNING_CFLAGS) -BUILT_SOURCES = native/config.h -DISTCLEANFILES = native/config.h web2c-parser.output +BUILT_SOURCES = w2c/config.h +DISTCLEANFILES = w2c/config.h web2c-parser.output noinst_HEADERS = coerce.h dist_noinst_SCRIPTS = convert dist_noinst_DATA = \ @@ -326,22 +326,22 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -native/kpathsea/c-auto.h: native/kpathsea/stamp-h1 +kpathsea/c-auto.h: kpathsea/stamp-h1 @if test ! -f $@; then \ - rm -f native/kpathsea/stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) native/kpathsea/stamp-h1; \ + rm -f kpathsea/stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) kpathsea/stamp-h1; \ else :; fi -native/kpathsea/stamp-h1: $(top_srcdir)/native/kpathsea/c-auto.in $(top_builddir)/config.status - @rm -f native/kpathsea/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status native/kpathsea/c-auto.h -$(top_srcdir)/native/kpathsea/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +kpathsea/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status + @rm -f kpathsea/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status kpathsea/c-auto.h +$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f native/kpathsea/stamp-h1 + rm -f kpathsea/stamp-h1 touch $@ distclean-hdr: - -rm -f native/kpathsea/c-auto.h native/kpathsea/stamp-h1 + -rm -f kpathsea/c-auto.h kpathsea/stamp-h1 clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -429,11 +429,11 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) c-auto.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) c-auto.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -451,9 +451,9 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ fi; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) c-auto.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) c-auto.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -749,14 +749,15 @@ uninstall-am: # Don't include our <c-auto.h>. -native/config.h: ../config.h - sed -e '/<c-auto\.h>/d' $(srcdir)/../config.h >$@ +w2c/config.h: ../w2c/config.h + $(MKDIR_P) w2c + sed -e '/c-auto\.h>/d' $(srcdir)/../w2c/config.h >$@ -$(web2c_OBJECTS): web2c-parser.h native/config.h +$(web2c_OBJECTS): web2c-parser.h w2c/config.h -$(fixwrites_OBJECTS): native/config.h +$(fixwrites_OBJECTS): w2c/config.h -$(splitup_OBJECTS): native/config.h +$(splitup_OBJECTS): w2c/config.h stamp-web2c: web2c$(EXEEXT) echo timestamp >$@ diff --git a/Build/source/texk/web2c/web2c/native/kpathsea/c-auto.in b/Build/source/texk/web2c/web2c/c-auto.in index e8f078eed6d..bfd63bf3343 100644 --- a/Build/source/texk/web2c/web2c/native/kpathsea/c-auto.in +++ b/Build/source/texk/web2c/web2c/c-auto.in @@ -1,4 +1,4 @@ -/* native/kpathsea/c-auto.in. Generated from configure.ac by autoheader. */ +/* c-auto.in. Generated from configure.ac by autoheader. */ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure index f6f108bbde5..4e160cf29de 100755 --- a/Build/source/texk/web2c/web2c/configure +++ b/Build/source/texk/web2c/web2c/configure @@ -12192,7 +12192,7 @@ fi done -ac_config_headers="$ac_config_headers native/kpathsea/c-auto.h:native/kpathsea/c-auto.in" +ac_config_headers="$ac_config_headers kpathsea/c-auto.h:c-auto.in" ac_config_files="$ac_config_files Makefile" @@ -13170,7 +13170,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "native/kpathsea/c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS native/kpathsea/c-auto.h:native/kpathsea/c-auto.in" ;; + "kpathsea/c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS kpathsea/c-auto.h:c-auto.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/Build/source/texk/web2c/web2c/configure.ac b/Build/source/texk/web2c/web2c/configure.ac index 1ff504e001d..dbf8cd163ad 100644 --- a/Build/source/texk/web2c/web2c/configure.ac +++ b/Build/source/texk/web2c/web2c/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with Autoconf to produce a configure script for Web2c. dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_CHECK_FUNCS([strerror]) AC_CHECK_HEADERS([errno.h]) dnl Write output here, instead of putting a zillion -D's on the command line. -AC_CONFIG_HEADERS([native/kpathsea/c-auto.h:native/kpathsea/c-auto.in]) +AC_CONFIG_HEADERS([kpathsea/c-auto.h:c-auto.in]) AC_CONFIG_FILES([Makefile]) diff --git a/Build/source/texk/web2c/web2c/fixwrites.c b/Build/source/texk/web2c/web2c/fixwrites.c index 91d4dbe9d11..6489377bea2 100644 --- a/Build/source/texk/web2c/web2c/fixwrites.c +++ b/Build/source/texk/web2c/web2c/fixwrites.c @@ -1,7 +1,7 @@ /* fixwrites -- convert Pascal write/writeln's into fprintf's or putc's. Originally by Tim Morgan, October 10, 1987. */ -#include "config.h" +#include <w2c/config.h> #include <kpathsea/c-pathmx.h> char buf[BUFSIZ], filename[PATH_MAX], args[100]; diff --git a/Build/source/texk/web2c/web2c/splitup.c b/Build/source/texk/web2c/web2c/splitup.c index 51c08345bfb..1ef7b509252 100644 --- a/Build/source/texk/web2c/web2c/splitup.c +++ b/Build/source/texk/web2c/web2c/splitup.c @@ -6,7 +6,7 @@ Tim Morgan September 19, 1987. */ -#include "config.h" +#include <w2c/config.h> #include <kpathsea/getopt.h> #if defined (FATAL) diff --git a/Build/source/texk/web2c/web2c/web2c.h b/Build/source/texk/web2c/web2c/web2c.h index 007abfee2f0..408d6430a44 100644 --- a/Build/source/texk/web2c/web2c/web2c.h +++ b/Build/source/texk/web2c/web2c/web2c.h @@ -1,6 +1,6 @@ /* web2c.h: general includes for the Web2c program itself. Public domain. */ -#include "config.h" +#include <w2c/config.h> #define ex_32 2 #define ex_real 3 diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index 716646d755f..e2594d32022 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -72,7 +72,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h +CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \ + $(top_builddir)/ff-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = ARFLAGS = cru @@ -89,7 +90,7 @@ am_libwindow_a_OBJECTS = amiga.$(OBJEXT) epsf.$(OBJEXT) \ trap.$(OBJEXT) uniterm.$(OBJEXT) win32.$(OBJEXT) \ $(am__objects_1) $(am__objects_2) libwindow_a_OBJECTS = $(am_libwindow_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 22f3bad4fa2..2fe4d64f90b 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,13 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/xetex.am (xetex_cppflags): Add $(AM_CPPFLAGS). + +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * bmpimage.h, pngimage.[ch]: #include <w2c/config.h> instead + of "config.h". + 2010-05-18 Karl Berry <karl@tug.org> * xetex.ch (XeTeX_version_string): incr to 0.9995.3. diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index bd2cd0255e6..c61b7dcc8be 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -1,6 +1,6 @@ ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## XeTeX @@ -15,7 +15,7 @@ nodist_EXTRA_xetex_SOURCES = dummy.cxx libxetex = libxetex.a -xetex_cppflags = -I$(srcdir)/xetexdir +xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir ## Must add icu first to avoid an installed version. xetex_cppflags += $(ICU_INCLUDES) ## Must add freetype2 includes early to avoid diff --git a/Build/source/texk/web2c/xetexdir/bmpimage.h b/Build/source/texk/web2c/xetexdir/bmpimage.h index 9c55b0c20f8..c2d248b001e 100644 --- a/Build/source/texk/web2c/xetexdir/bmpimage.h +++ b/Build/source/texk/web2c/xetexdir/bmpimage.h @@ -50,7 +50,7 @@ #define _BMPIMAGE_H_ #if HAVE_CONFIG_H -#include "config.h" +#include <w2c/config.h> #endif #include "mfileio.h" diff --git a/Build/source/texk/web2c/xetexdir/pngimage.c b/Build/source/texk/web2c/xetexdir/pngimage.c index 0701c4f46d0..25f7362562c 100644 --- a/Build/source/texk/web2c/xetexdir/pngimage.c +++ b/Build/source/texk/web2c/xetexdir/pngimage.c @@ -46,7 +46,7 @@ */ #if HAVE_CONFIG_H -#include "config.h" +#include <w2c/config.h> #endif /* diff --git a/Build/source/texk/web2c/xetexdir/pngimage.h b/Build/source/texk/web2c/xetexdir/pngimage.h index c00387ca4f0..c126986c5c7 100644 --- a/Build/source/texk/web2c/xetexdir/pngimage.h +++ b/Build/source/texk/web2c/xetexdir/pngimage.h @@ -50,7 +50,7 @@ #define _PNGIMAGE_H_ #if HAVE_CONFIG_H -#include "config.h" +#include <w2c/config.h> #endif #include "mfileio.h" |