summaryrefslogtreecommitdiff
path: root/Build/source/texk/ptexenc
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-14 14:22:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-14 14:22:18 +0000
commit008d0283f16c958ef9f8436cef8710aaedcd6a1c (patch)
tree26ef9bed7c0ca3f3f6b1ba14b5844f76d166eef0 /Build/source/texk/ptexenc
parentcf42cec28487ec62783c7aaeecbaea79862794bf (diff)
build system: fixes for pTeX
git-svn-id: svn://tug.org/texlive/trunk@17865 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ptexenc')
-rw-r--r--Build/source/texk/ptexenc/ChangeLog.TL7
-rw-r--r--Build/source/texk/ptexenc/Makefile.am9
-rw-r--r--Build/source/texk/ptexenc/Makefile.in8
3 files changed, 22 insertions, 2 deletions
diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL
index a2796b0aaab..2f555a9d273 100644
--- a/Build/source/texk/ptexenc/ChangeLog.TL
+++ b/Build/source/texk/ptexenc/ChangeLog.TL
@@ -1,6 +1,13 @@
ChangeLog.TL: TeX Live (TL) changes for ptexenc
===============================================
+2010-04-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (rebuild): New target for forced (re-)build.
+ (INCLUDES): Add $(KPATHSEA_INCLUDES) in case we use an installed
+ (system) version.
+ Add rule to rebuild libkpathsea, if necessary.
+
2010-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* ptexenc.c (NOFILE) [MinGW32]: Always define it.
diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am
index fcc54254338..5d1848e2dcd 100644
--- a/Build/source/texk/ptexenc/Makefile.am
+++ b/Build/source/texk/ptexenc/Makefile.am
@@ -5,7 +5,11 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+# Rebuild
+.PHONY: rebuild
+rebuild: all
+
+INCLUDES = $(KPATHSEA_INCLUDES) -I$(top_builddir)/.. -I$(top_srcdir)/..
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libptexenc.la
@@ -16,6 +20,9 @@ libptexenc_la_LDFLAGS = -version-number $(PTEXENC_LT_VERSNUM)
libptexenc_la_SOURCES = kanjicnv.c ptexenc.c unicode-jp.c unicode.c
+## Rebuild libkpathsea
+@KPATHSEA_RULE@
+
ptexencincludedir = ${includedir}/ptexenc
nodist_ptexencinclude_HEADERS = c-auto.h
diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in
index b118ce5340a..314fb6fe942 100644
--- a/Build/source/texk/ptexenc/Makefile.in
+++ b/Build/source/texk/ptexenc/Makefile.in
@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+INCLUDES = $(KPATHSEA_INCLUDES) -I$(top_builddir)/.. -I$(top_srcdir)/..
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libptexenc.la
libptexenc_la_CPPFLAGS = -DMAKE_KPSE_DLL
@@ -794,6 +794,12 @@ uninstall-am: uninstall-libLTLIBRARIES \
uninstall-ptexencincludeHEADERS
+# Rebuild
+.PHONY: rebuild
+rebuild: all
+
+@KPATHSEA_RULE@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: