summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/window
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/texk/web2c/window
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/texk/web2c/window')
-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
3 files changed, 6 insertions, 5 deletions
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 \