summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-27 15:55:10 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-27 15:55:10 +0000
commitfcbfe57b79d94ecbaa2abcd79da6545496aa01cc (patch)
tree2e602fe1d322880f23724c4d8c819b4a806c6dcd /Build
parent178de0871d690556af74f3768c11bc812b07f347 (diff)
avoid to split luatex C code
git-svn-id: svn://tug.org/texlive/trunk@12530 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/Makefile.in51
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am2
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog5
-rwxr-xr-xBuild/source/texk/web2c/web2c/convert4
5 files changed, 15 insertions, 52 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index d48f44066f1..1fc2426706a 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -350,9 +350,7 @@ nodist_luatangle_OBJECTS = luatangle.$(OBJEXT)
luatangle_OBJECTS = $(nodist_luatangle_OBJECTS)
luatangle_LDADD = $(LDADD)
luatangle_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_6 = luatex-luatexini.$(OBJEXT) luatex-luatex0.$(OBJEXT) \
- luatex-luatex1.$(OBJEXT) luatex-luatex2.$(OBJEXT) \
- luatex-luatex3.$(OBJEXT)
+am__objects_6 = luatex-luatexini.$(OBJEXT) luatex-luatex0.$(OBJEXT)
nodist_luatex_OBJECTS = $(am__objects_6) luatex-luatex-pool.$(OBJEXT) \
luatex-luatexextra.$(OBJEXT)
luatex_OBJECTS = $(nodist_luatex_OBJECTS)
@@ -1087,7 +1085,7 @@ luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a liblua51.a \
luatex_LDADD = $(luatex_ldadd) $(LDADD) $(socketlibs)
luatex_DEPENDENCIES = $(proglib) libluatex.a $(LIBPNG_DEPEND) \
$(ZLIB_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a
-luatex_c_h = luatexini.c luatex0.c luatex1.c luatex2.c luatex3.c luatexcoerce.h luatexd.h
+luatex_c_h = luatexini.c luatex0.c luatexcoerce.h luatexd.h
nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luatexextra.h
luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch
nodist_luatangle_SOURCES = luatangle.c luatangle.h
@@ -2069,9 +2067,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-dummy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-luatex-pool.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-luatex0.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-luatex1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-luatex2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-luatex3.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-luatexextra.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-luatexini.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5main-md5main.Po@am__quote@
@@ -5068,48 +5063,6 @@ luatex-luatex0.obj: luatex0.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatex-luatex0.obj `if test -f 'luatex0.c'; then $(CYGPATH_W) 'luatex0.c'; else $(CYGPATH_W) '$(srcdir)/luatex0.c'; fi`
-luatex-luatex1.o: luatex1.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatex-luatex1.o -MD -MP -MF $(DEPDIR)/luatex-luatex1.Tpo -c -o luatex-luatex1.o `test -f 'luatex1.c' || echo '$(srcdir)/'`luatex1.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/luatex-luatex1.Tpo $(DEPDIR)/luatex-luatex1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatex1.c' object='luatex-luatex1.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatex-luatex1.o `test -f 'luatex1.c' || echo '$(srcdir)/'`luatex1.c
-
-luatex-luatex1.obj: luatex1.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatex-luatex1.obj -MD -MP -MF $(DEPDIR)/luatex-luatex1.Tpo -c -o luatex-luatex1.obj `if test -f 'luatex1.c'; then $(CYGPATH_W) 'luatex1.c'; else $(CYGPATH_W) '$(srcdir)/luatex1.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/luatex-luatex1.Tpo $(DEPDIR)/luatex-luatex1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatex1.c' object='luatex-luatex1.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatex-luatex1.obj `if test -f 'luatex1.c'; then $(CYGPATH_W) 'luatex1.c'; else $(CYGPATH_W) '$(srcdir)/luatex1.c'; fi`
-
-luatex-luatex2.o: luatex2.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatex-luatex2.o -MD -MP -MF $(DEPDIR)/luatex-luatex2.Tpo -c -o luatex-luatex2.o `test -f 'luatex2.c' || echo '$(srcdir)/'`luatex2.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/luatex-luatex2.Tpo $(DEPDIR)/luatex-luatex2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatex2.c' object='luatex-luatex2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatex-luatex2.o `test -f 'luatex2.c' || echo '$(srcdir)/'`luatex2.c
-
-luatex-luatex2.obj: luatex2.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatex-luatex2.obj -MD -MP -MF $(DEPDIR)/luatex-luatex2.Tpo -c -o luatex-luatex2.obj `if test -f 'luatex2.c'; then $(CYGPATH_W) 'luatex2.c'; else $(CYGPATH_W) '$(srcdir)/luatex2.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/luatex-luatex2.Tpo $(DEPDIR)/luatex-luatex2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatex2.c' object='luatex-luatex2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatex-luatex2.obj `if test -f 'luatex2.c'; then $(CYGPATH_W) 'luatex2.c'; else $(CYGPATH_W) '$(srcdir)/luatex2.c'; fi`
-
-luatex-luatex3.o: luatex3.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatex-luatex3.o -MD -MP -MF $(DEPDIR)/luatex-luatex3.Tpo -c -o luatex-luatex3.o `test -f 'luatex3.c' || echo '$(srcdir)/'`luatex3.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/luatex-luatex3.Tpo $(DEPDIR)/luatex-luatex3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatex3.c' object='luatex-luatex3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatex-luatex3.o `test -f 'luatex3.c' || echo '$(srcdir)/'`luatex3.c
-
-luatex-luatex3.obj: luatex3.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatex-luatex3.obj -MD -MP -MF $(DEPDIR)/luatex-luatex3.Tpo -c -o luatex-luatex3.obj `if test -f 'luatex3.c'; then $(CYGPATH_W) 'luatex3.c'; else $(CYGPATH_W) '$(srcdir)/luatex3.c'; fi`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/luatex-luatex3.Tpo $(DEPDIR)/luatex-luatex3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatex3.c' object='luatex-luatex3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatex-luatex3.obj `if test -f 'luatex3.c'; then $(CYGPATH_W) 'luatex3.c'; else $(CYGPATH_W) '$(srcdir)/luatex3.c'; fi`
-
luatex-luatex-pool.o: luatex-pool.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatex-luatex-pool.o -MD -MP -MF $(DEPDIR)/luatex-luatex-pool.Tpo -c -o luatex-luatex-pool.o `test -f 'luatex-pool.c' || echo '$(srcdir)/'`luatex-pool.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/luatex-luatex-pool.Tpo $(DEPDIR)/luatex-luatex-pool.Po
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index efaac4a9191..e14ca3a191d 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/luatex.am (luatex_c_h): avoid to split the C code
+ (from Taco).
+
2009-03-27 Taco Hoekwater <taco@luatex.org>
* luatexdir: import of the current state of luatex, 0.37.0.
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 9e3a5c69f1b..72b83334526 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -26,7 +26,7 @@ luatex_DEPENDENCIES = $(proglib) libluatex.a
luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND)
luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a
-luatex_c_h = luatexini.c luatex0.c luatex1.c luatex2.c luatex3.c luatexcoerce.h luatexd.h
+luatex_c_h = luatexini.c luatex0.c luatexcoerce.h luatexd.h
nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luatexextra.h
$(luatex_c_h): luatex-web2c
luatex-web2c: luatex.p $(web2c_texmf) luatexdir/luatex.defines
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 622f1cb15d2..567ea750bce 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * convert (splitup_options for luatex)): avoid to split the C
+ code (from Taco).
+
2009-03-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* splitup.c: avoid using program_invocation_name (from Taco).
diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert
index 888e94395bc..2f722d233fd 100755
--- a/Build/source/texk/web2c/web2c/convert
+++ b/Build/source/texk/web2c/web2c/convert
@@ -108,9 +108,9 @@ ${basefile}coerce.h"
web2c_options="-t -c${basefile}coerce"
hfile=texmfmp.h
fixwrites_options=-t
- splitup_options="-i -l 13500"
+ splitup_options="-i -l 65000"
postcmd="| ./web2c/splitup $splitup_options ${basefile}"
- cfile=${basefile}2.c # last output file, or thereabouts
+ cfile=${basefile}0.c # last output file, or thereabouts
output=
output_files="$basefile[0-9].c ${basefile}ini.c ${basefile}d.h \
${basefile}coerce.h"