summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-05-21 07:51:41 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-05-21 07:51:41 +0000
commita5a98005f0e6fa8f756d8d17c697a5c9c2cdd845 (patch)
tree3161462462fbeeea8d0136f0afb585b8ef830938 /Build/source/texk/web2c
parentcfa39878481410fe63d2d11afaa18fc74cb4a863 (diff)
reorg ptexenc includes
fix some build rules remove obsolete files git-svn-id: svn://tug.org/texlive/trunk@18399 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/Makefile.am2
-rw-r--r--Build/source/texk/web2c/Makefile.in4
-rwxr-xr-xBuild/source/texk/web2c/configure6
-rw-r--r--Build/source/texk/web2c/lib/Makefile.am5
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in5
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am2
8 files changed, 20 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index fccd99114c0..2b9e3da7f3d 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Fix the lib/libp.a rebuild rule.
+
2010-05-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* cpascal.h (BIBXRETALLOCNOSET, BIBXRETALLOCSTRING): Cast size_t
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 983ac742764..9da3593352f 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -76,7 +76,7 @@ web2c/stamp-makecpool: $(web2c_common) ${srcdir}/web2c/makecpool.c
# Rebuild $(proglib)
$(proglib): ${srcdir}/lib/*.c
- cd lib && $(MAKE) $(AM_MAKEFLAGS)
+ cd lib && $(MAKE) $(AM_MAKEFLAGS) lib.a
## Rebuild libkpathsea
@KPATHSEA_RULE@
## Rebuild libz
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 64007cbf543..b203af932f4 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -8649,7 +8649,7 @@ web2c/stamp-makecpool: $(web2c_common) ${srcdir}/web2c/makecpool.c
# Rebuild $(proglib)
$(proglib): ${srcdir}/lib/*.c
- cd lib && $(MAKE) $(AM_MAKEFLAGS)
+ cd lib && $(MAKE) $(AM_MAKEFLAGS) lib.a
@KPATHSEA_RULE@
@ZLIB_RULE@
@LIBPNG_RULE@
@@ -8986,7 +8986,7 @@ etrip-clean:
rm -rf tfm
# Rebuild $(pproglib)
$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
- cd lib && $(MAKE) $(AM_MAKEFLAGS)
+ cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a
@PTEXENC_RULE@
$(ptex_OBJECTS): $(ptex_prereq)
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index cf2154028bb..d4d6389bbed 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -21232,7 +21232,7 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th
PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS"
fi
else
- PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \
+ PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \
@@ -21241,9 +21241,7 @@ else
PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \
-e 's,BLD/texk/,${top_builddir}/../,g'`
PTEXENC_RULE='# Rebuild libptexenc
-$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/ptexenc.h
- cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../ptexenc/ptexenc.h:
+$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h
cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
diff --git a/Build/source/texk/web2c/lib/Makefile.am b/Build/source/texk/web2c/lib/Makefile.am
index 8488b4e98bf..87a5ff67a60 100644
--- a/Build/source/texk/web2c/lib/Makefile.am
+++ b/Build/source/texk/web2c/lib/Makefile.am
@@ -3,7 +3,8 @@
## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
+INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
## Rebuild libkpathsea
@@ -37,7 +38,7 @@ lib_a_SOURCES = \
## Replacements for pTeX.
##
-libp_a_CPPFLAGS = -DPTEX $(ENCTEX_INCLUDES)
+libp_a_CPPFLAGS = -DPTEX $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
libp_a_SOURCES = \
openclose.c \
printversion.c
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 4a2a8917a7a..2123cb28f36 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -297,7 +297,8 @@ top_srcdir = @top_srcdir@
wlibs = @wlibs@
x_ext_lib = @x_ext_lib@
x_tool_libs = @x_tool_libs@
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
+INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = lib.a $(am__append_1)
EXTRA_LIBRARIES = libp.a
@@ -319,7 +320,7 @@ lib_a_SOURCES = \
version.c \
zround.c
-libp_a_CPPFLAGS = -DPTEX $(ENCTEX_INCLUDES)
+libp_a_CPPFLAGS = -DPTEX $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
libp_a_SOURCES = \
openclose.c \
printversion.c
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index fe47255862c..95ea697c403 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ptex.am: Fix the lib/libp.a rebuild rule.
+
2010-05-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* nissya.test (new): Shell script for pBibTeX test using kanji.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index b253e1eebef..dfb8f285593 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -27,7 +27,7 @@ DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
pproglib = lib/libp.a
# Rebuild $(pproglib)
$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
- cd lib && $(MAKE) $(AM_MAKEFLAGS)
+ cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a
## Rebuild libptexenc
@PTEXENC_RULE@