diff options
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/image/epdf.h | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/lua51/luaconf.h | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/epdf.h | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/pbibtex.ch | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/synctexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/synctexdir/synctex_main.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/synctexdir/synctex_parser_local.h | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/web2c/ChangeLog | 3 | ||||
-rw-r--r-- | Build/source/texk/web2c/web2c/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/web2c/Makefile.in | 6 |
16 files changed, 43 insertions, 29 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index c2e862388f4..37ff1a7cb59 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -3,6 +3,11 @@ * texmfmp.h: remove TEXDLL. * config.h: still there is TEXDLL for safety. +2010-04-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (INCLUDES): Remove '-I$(top_builddir)/..' and + '-I$(top_srcdir)/..'. + 2010-04-22 Peter Breitenlohner <peb@mppmu.mpg.de> * pltotf.ch, vptovf.ch: Bug fix, from ptexdir/ppltotf.ch by diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 69d57c5308e..983ac742764 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -5,9 +5,7 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -# First $(KPATHSEA_INCLUDES), then -I$(top_srcdir)/.. -# for the case of installed (system) kpathsea headers. -INCLUDES = -I$(top_builddir)/.. $(KPATHSEA_INCLUDES) -I$(top_srcdir)/.. +INCLUDES = $(KPATHSEA_INCLUDES) AM_CPPFLAGS = ## Not yet for C, C++, and ObjC++ (too many warnings or not yet implemented) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 91dcd7b7d96..86cac69e634 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -1154,10 +1154,7 @@ wlibs = @wlibs@ x_ext_lib = @x_ext_lib@ x_tool_libs = @x_tool_libs@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 - -# First $(KPATHSEA_INCLUDES), then -I$(top_srcdir)/.. -# for the case of installed (system) kpathsea headers. -INCLUDES = -I$(top_builddir)/.. $(KPATHSEA_INCLUDES) -I$(top_srcdir)/.. +INCLUDES = $(KPATHSEA_INCLUDES) AM_CPPFLAGS = AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = ## $(WARNING_CXXFLAGS) diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 9cab78f7e4a..cbebd516fcb 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2010-04-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * image/epdf.h, lua51/luaconf.h: #include <c-auto.h> instead of + <web2c/c-auto.h>. + 2010-04-24 Taco Hoekwater <taco@luatex> * lua/loslibext.c: fix os.exec() and os.spawn(), twice @@ -26,7 +31,6 @@ * luafontloader/fontforge/Unicode/backtrns.c: deleted * luafontloader/fontforge/Unicode/unialt.c: deleted - 2010-04-13 Peter Breitenlohner <peb@mppmu.mpg.de> * image/pdftoepdf.cc: Fix building with libpoppler. diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.h b/Build/source/texk/web2c/luatexdir/image/epdf.h index 6d2632b0e54..34a094faed7 100644 --- a/Build/source/texk/web2c/luatexdir/image/epdf.h +++ b/Build/source/texk/web2c/luatexdir/image/epdf.h @@ -75,7 +75,7 @@ extern "C" { # undef CONFIG_H /* header file */ # endif -# include <web2c/c-auto.h> /* define SIZEOF_LONG */ +# include <c-auto.h> /* define SIZEOF_LONG */ # include "openbsd-compat.h" # include "image.h" diff --git a/Build/source/texk/web2c/luatexdir/lua51/luaconf.h b/Build/source/texk/web2c/luatexdir/lua51/luaconf.h index fac58d8cb5c..fc89eae731e 100644 --- a/Build/source/texk/web2c/luatexdir/lua51/luaconf.h +++ b/Build/source/texk/web2c/luatexdir/lua51/luaconf.h @@ -11,7 +11,7 @@ #include <limits.h> #include <stddef.h> -#include <web2c/c-auto.h> +#include <c-auto.h> /* ** ================================================================== diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index f568296d3e5..7c8ae2fb49f 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,7 @@ +2010-04-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * epdf.h: #include <c-auto.h> instead of <web2c/c-auto.h> etc. + 2010-04-22 Peter Breitenlohner <peb@mppmu.mpg.de> * am/pdftex.am (EXTRA_DIST): Add etexdir/etex.ch. diff --git a/Build/source/texk/web2c/pdftexdir/epdf.h b/Build/source/texk/web2c/pdftexdir/epdf.h index 40db0974366..0569915225e 100644 --- a/Build/source/texk/web2c/pdftexdir/epdf.h +++ b/Build/source/texk/web2c/pdftexdir/epdf.h @@ -36,10 +36,10 @@ extern "C" { # undef CONFIG_H /* header file */ #endif -#include <web2c/c-auto.h> /* define SIZEOF_LONG */ -#include <web2c/config.h> /* define type integer */ +#include <c-auto.h> /* define SIZEOF_LONG */ +#include <config.h> /* define type integer */ -#include <web2c/pdftexdir/ptexmac.h> +#include <pdftexdir/ptexmac.h> #include "openbsd-compat.h" diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index ce52dcdf827..bd926999d09 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2010-04-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * pbibtex.ch: Remove unused code 'Check if |max_print_line|...'. + Akira Kakuto <kakuto@fuk.kindai.ac.jp>, 24 Apr 2010 12:10:13. + 2010-04-23 Peter Breitenlohner <peb@mppmu.mpg.de> * pbibtex.ch, kanji.h: Use input_line2() with five arguments diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.ch b/Build/source/texk/web2c/ptexdir/pbibtex.ch index fae1c10b497..8928da48687 100644 --- a/Build/source/texk/web2c/ptexdir/pbibtex.ch +++ b/Build/source/texk/web2c/ptexdir/pbibtex.ch @@ -614,13 +614,6 @@ end; @ modules for JBibTeX -@<Check if |max_print_line|-1 is in mid kanji@>= -t:=0; -while(t<max_print_line-1) do - if out_buf[t]>127 then t:=t+2 else t:=t+1; -in_mid_kanji:= t>=max_print_line; - -@ @<|execute_fn|({\.{is.kanji.str\$}})@>= procedure x_is_kanji_str; label exit; diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index caf99d026ed..74772ed8b85 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,8 @@ +2010-04-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * synctex_main.c, synctex_parser_local.h: #include "c-auto.h" + instead of "web2c/c-auto.h". + 2010-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> * am/synctex.am (synctex_CFLAGS): Enable compiler warnings. diff --git a/Build/source/texk/web2c/synctexdir/synctex_main.c b/Build/source/texk/web2c/synctexdir/synctex_main.c index 489c621afa8..921e09fcd99 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 "web2c/c-auto.h" /* for inline && HAVE_xxx */ +# include "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 80f553e44a6..d84f5ee051f 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 "web2c/c-auto.h" /* for inline && HAVE_xxx */ +# include "c-auto.h" /* for inline && HAVE_xxx */ /* No inlining for synctex tool in texlive. */ # define SYNCTEX_INLINE diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog index db4fdc14cbd..351637a9c4f 100644 --- a/Build/source/texk/web2c/web2c/ChangeLog +++ b/Build/source/texk/web2c/web2c/ChangeLog @@ -2,6 +2,9 @@ * fixwrites.c (main): Recognize 'conststringcast...' as string. + * Makefile.am (INCLUDES): Remove '-I$(srcdir)/..'. + (native/config.h): Adapted. + 2010-04-20 Peter Breitenlohner <peb@mppmu.mpg.de> * coerce.h: Remove luaTeX specific code. diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am index c60be49912f..1471107ddc5 100644 --- a/Build/source/texk/web2c/web2c/Makefile.am +++ b/Build/source/texk/web2c/web2c/Makefile.am @@ -1,11 +1,11 @@ ## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/ ## -## 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. ## ACLOCAL_AMFLAGS = -I ../../../m4 -INCLUDES = -Inative -I$(srcdir)/native -I$(srcdir)/.. -I$(srcdir)/../.. +INCLUDES = -Inative -I$(srcdir)/native -I$(srcdir)/../.. AM_YFLAGS = -d -v AM_CFLAGS = $(WARNING_CFLAGS) @@ -15,9 +15,9 @@ BUILT_SOURCES = native/config.h DISTCLEANFILES = native/config.h -# Include <kpathsea/c-auto.h> instead of <web2c/c-auto.h> +# Don't include our <c-auto.h>. native/config.h: ../config.h - sed -e 's,web2c/c-auto,kpathsea/c-auto,' $(srcdir)/../config.h >$@ + sed -e '/<c-auto\.h>/d' $(srcdir)/../config.h >$@ noinst_HEADERS = coerce.h diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in index 3f45a76ae1b..b2a7e87d795 100644 --- a/Build/source/texk/web2c/web2c/Makefile.in +++ b/Build/source/texk/web2c/web2c/Makefile.in @@ -251,7 +251,7 @@ 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)/.. -I$(srcdir)/../.. +INCLUDES = -Inative -I$(srcdir)/native -I$(srcdir)/../.. AM_YFLAGS = -d -v AM_CFLAGS = $(WARNING_CFLAGS) BUILT_SOURCES = native/config.h @@ -748,9 +748,9 @@ uninstall-am: tags uninstall uninstall-am -# Include <kpathsea/c-auto.h> instead of <web2c/c-auto.h> +# Don't include our <c-auto.h>. native/config.h: ../config.h - sed -e 's,web2c/c-auto,kpathsea/c-auto,' $(srcdir)/../config.h >$@ + sed -e '/<c-auto\.h>/d' $(srcdir)/../config.h >$@ $(web2c_OBJECTS): web2c-parser.h |