summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/lib
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-10 13:18:47 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-10 13:18:47 +0000
commit5af1aa3cd449e5a6abb4972dcd9090bbe61162de (patch)
treecb4e4668b85d773dbb9ed7019ea250488a760948 /Build/source/texk/web2c/lib
parent3afa3f06a4c3c3750742e7a6db8f20314c53183a (diff)
texk/web2c: reorganize headers and CPPFLAGS
git-svn-id: svn://tug.org/texlive/trunk@18865 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/lib')
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog10
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in5
-rw-r--r--Build/source/texk/web2c/lib/alloca.c2
-rw-r--r--Build/source/texk/web2c/lib/basechsuffix.c2
-rw-r--r--Build/source/texk/web2c/lib/chartostring.c2
-rw-r--r--Build/source/texk/web2c/lib/coredump.c2
-rw-r--r--Build/source/texk/web2c/lib/eofeoln.c2
-rw-r--r--Build/source/texk/web2c/lib/fprintreal.c2
-rw-r--r--Build/source/texk/web2c/lib/input2int.c2
-rw-r--r--Build/source/texk/web2c/lib/inputint.c2
-rw-r--r--Build/source/texk/web2c/lib/main.c2
-rw-r--r--Build/source/texk/web2c/lib/openclose.c2
-rw-r--r--Build/source/texk/web2c/lib/printversion.c2
-rw-r--r--Build/source/texk/web2c/lib/setupvar.c2
-rw-r--r--Build/source/texk/web2c/lib/uexit.c2
-rw-r--r--Build/source/texk/web2c/lib/usage.c2
-rw-r--r--Build/source/texk/web2c/lib/version.c2
-rw-r--r--Build/source/texk/web2c/lib/zround.c2
18 files changed, 29 insertions, 18 deletions
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