summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-23 13:33:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-23 13:33:45 +0000
commitd94d1e19012275a489939c56c6df011e126cb682 (patch)
tree5dcdf20804c79b29783d5a52e50c7c0def670411 /Build/source
parent0af56a69384564cd03264928f7c602319a12128d (diff)
web2c (TeX & Co): Avoid use of deprecated INCLUDES
git-svn-id: svn://tug.org/texlive/trunk@28339 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/ChangeLog6
-rw-r--r--Build/source/texk/web2c/Makefile.am2
-rw-r--r--Build/source/texk/web2c/Makefile.in1
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
-rw-r--r--Build/source/texk/web2c/lib/Makefile.am5
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in3
-rw-r--r--Build/source/texk/web2c/otps/ChangeLog4
-rw-r--r--Build/source/texk/web2c/otps/Makefile.am4
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in2
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.am4
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.in2
-rw-r--r--Build/source/texk/web2c/window/ChangeLog4
-rw-r--r--Build/source/texk/web2c/window/Makefile.am4
-rw-r--r--Build/source/texk/web2c/window/Makefile.in3
15 files changed, 33 insertions, 19 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 4821b16f039..5a4918a70b7 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: No need to check for Annot::decRefCnt with
+ poppler 0.18 or better.
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/bootstrap.am: Add dependency of (c)tangleboot_OBJECTS on
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index a366139816e..5da453d391d 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -5,12 +5,10 @@
##
ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-INCLUDES =
AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
## Not yet for C, C++, and ObjC++ (too many warnings or not yet implemented)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
-## Not yet for ObjC++ (not yet implemented)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index c2b1ce6d593..8868d4a9aeb 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1379,7 +1379,6 @@ wlibs = @wlibs@
x_ext_lib = @x_ext_lib@
x_tool_libs = @x_tool_libs@
ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-INCLUDES =
AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index ee2ec93cac6..37359bbfc89 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-14 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
* texmfmp.c: Use _IONBF for unbuffered stream.
diff --git a/Build/source/texk/web2c/lib/Makefile.am b/Build/source/texk/web2c/lib/Makefile.am
index 2368f7b053f..927a2d7c976 100644
--- a/Build/source/texk/web2c/lib/Makefile.am
+++ b/Build/source/texk/web2c/lib/Makefile.am
@@ -1,10 +1,9 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/lib/
##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-INCLUDES = -I$(top_srcdir)
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
## Rebuild libkpathsea
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 7c3435596a7..36dea545984 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -322,8 +322,7 @@ top_srcdir = @top_srcdir@
wlibs = @wlibs@
x_ext_lib = @x_ext_lib@
x_tool_libs = @x_tool_libs@
-INCLUDES = -I$(top_srcdir)
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = lib.a $(am__append_1)
EXTRA_LIBRARIES = libp.a
diff --git a/Build/source/texk/web2c/otps/ChangeLog b/Build/source/texk/web2c/otps/ChangeLog
index 6ca49964716..eec93db3da8 100644
--- a/Build/source/texk/web2c/otps/ChangeLog
+++ b/Build/source/texk/web2c/otps/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* otp-parser.[ch]: Regenerate with bison 2.5.1.
diff --git a/Build/source/texk/web2c/otps/Makefile.am b/Build/source/texk/web2c/otps/Makefile.am
index cd7e89bbd16..194e942dd36 100644
--- a/Build/source/texk/web2c/otps/Makefile.am
+++ b/Build/source/texk/web2c/otps/Makefile.am
@@ -1,9 +1,9 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/otps/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 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)
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_YFLAGS = -d -v
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 577c9b049c4..53596ca3b59 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -409,7 +409,7 @@ 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)
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_YFLAGS = -d -v
proglib = ../lib/lib.a
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index d34d286d243..88786d2e2ed 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-08-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* fixwrites.c, main.c, makecpool.c, splitup.c:
diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am
index c0874c4d348..1060ce3a1fe 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-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../../m4
-INCLUDES = -I$(srcdir)/../..
+AM_CPPFLAGS = -I$(srcdir)/../..
AM_YFLAGS = -d -v
AM_CFLAGS = $(WARNING_CFLAGS)
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 02444510134..d421b9a59f9 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -283,7 +283,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../../m4
-INCLUDES = -I$(srcdir)/../..
+AM_CPPFLAGS = -I$(srcdir)/../..
AM_YFLAGS = -d -v
AM_CFLAGS = $(WARNING_CFLAGS)
BUILT_SOURCES = w2c/config.h
diff --git a/Build/source/texk/web2c/window/ChangeLog b/Build/source/texk/web2c/window/ChangeLog
index 57fba18c125..d1e41767ca3 100644
--- a/Build/source/texk/web2c/window/ChangeLog
+++ b/Build/source/texk/web2c/window/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* win32.c: Avoid TL W32TeX differences.
diff --git a/Build/source/texk/web2c/window/Makefile.am b/Build/source/texk/web2c/window/Makefile.am
index 605e300c3d0..39f45df5e0d 100644
--- a/Build/source/texk/web2c/window/Makefile.am
+++ b/Build/source/texk/web2c/window/Makefile.am
@@ -3,9 +3,7 @@
## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-INCLUDES = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
-
-AM_CPPFLAGS = $(X_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(KPATHSEA_INCLUDES) $(X_CFLAGS)
AM_CFLAGS = $(WARNING_CFLAGS)
## Rebuild libkpathsea
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index ab5423c881f..c12f4f57b58 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -320,8 +320,7 @@ top_srcdir = @top_srcdir@
wlibs = @wlibs@
x_ext_lib = @x_ext_lib@
x_tool_libs = @x_tool_libs@
-INCLUDES = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = $(X_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(KPATHSEA_INCLUDES) $(X_CFLAGS)
AM_CFLAGS = $(WARNING_CFLAGS)
EXTRA_LIBRARIES = libwindow.a
libwindow_a_SOURCES = amiga.c epsf.c hp2627.c mfdisplay.h mftalk.c \