summaryrefslogtreecommitdiff
path: root/Build/source/libs/graphite
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/graphite')
-rw-r--r--Build/source/libs/graphite/ChangeLog4
-rw-r--r--Build/source/libs/graphite/Makefile.am8
-rw-r--r--Build/source/libs/graphite/Makefile.in5
3 files changed, 10 insertions, 7 deletions
diff --git a/Build/source/libs/graphite/ChangeLog b/Build/source/libs/graphite/ChangeLog
index 7c9c24a9ea9..d22ed96e2a3 100644
--- a/Build/source/libs/graphite/ChangeLog
+++ b/Build/source/libs/graphite/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-03-16 Peter Breitenlohner <peb@mppmu.mpg.de>
Import engine-2.4
diff --git a/Build/source/libs/graphite/Makefile.am b/Build/source/libs/graphite/Makefile.am
index 385c1c0d0bd..8f711de11b0 100644
--- a/Build/source/libs/graphite/Makefile.am
+++ b/Build/source/libs/graphite/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory libs/graphite/
##
-## Copyright (C) 2009, 2010 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
@@ -26,9 +26,9 @@ dist-hook:
SUBDIRS = include/graphite
-INCLUDES = -I$(top_srcdir)/$(GRAPHITE_TREE)/include/graphite -I$(top_srcdir)/$(GRAPHITE_TREE)/src/generic
-INCLUDES += -I$(top_srcdir)/$(GRAPHITE_TREE)/src/font -I$(top_srcdir)/$(GRAPHITE_TREE)/src/segment
-AM_CPPFLAGS = -DNDEBUG
+AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE_TREE)/include/graphite -I$(top_srcdir)/$(GRAPHITE_TREE)/src/generic
+AM_CPPFLAGS += -I$(top_srcdir)/$(GRAPHITE_TREE)/src/font -I$(top_srcdir)/$(GRAPHITE_TREE)/src/segment
+AM_CPPFLAGS += -DNDEBUG
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/Build/source/libs/graphite/Makefile.in b/Build/source/libs/graphite/Makefile.in
index 3ff716fc933..80a82a7de2e 100644
--- a/Build/source/libs/graphite/Makefile.in
+++ b/Build/source/libs/graphite/Makefile.in
@@ -270,11 +270,10 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(GRAPHITE_TREE) $(GRAPHITE_TREE)-PATCHES
SUBDIRS = include/graphite
-INCLUDES = -I$(top_srcdir)/$(GRAPHITE_TREE)/include/graphite \
+AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE_TREE)/include/graphite \
-I$(top_srcdir)/$(GRAPHITE_TREE)/src/generic \
-I$(top_srcdir)/$(GRAPHITE_TREE)/src/font \
- -I$(top_srcdir)/$(GRAPHITE_TREE)/src/segment
-AM_CPPFLAGS = -DNDEBUG
+ -I$(top_srcdir)/$(GRAPHITE_TREE)/src/segment -DNDEBUG
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
noinst_LIBRARIES = libgraphite.a