From 6cc553b4ef0a05f7d7af76d2e6eda6ff8c8ef76d Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 4 Jan 2013 07:51:28 +0000 Subject: graphite2: Add the required AM_CPP_FLAGS Fix syntax of the test case for system graphite2 git-svn-id: svn://tug.org/texlive/trunk@28723 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/graphite2/Makefile.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Build/source/libs/graphite2/Makefile.in') diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in index 4effce8040f..93eb67eb2bc 100644 --- a/Build/source/libs/graphite2/Makefile.in +++ b/Build/source/libs/graphite2/Makefile.in @@ -57,8 +57,11 @@ host_triplet = @host@ @WITH_SEGCACHE_TRUE@ $(GRAPHITE2_SRC)/SegCacheEntry.cpp \ @WITH_SEGCACHE_TRUE@ $(GRAPHITE2_SRC)/SegCacheStore.cpp -@WITH_FILEFACE_TRUE@am__append_4 = $(GRAPHITE2_SRC)/FileFace.cpp -@WITH_TRACING_TRUE@am__append_5 = $(GRAPHITE2_SRC)/json.cpp +@WITH_SEGCACHE_FALSE@am__append_4 = -DGRAPHITE2_NSEGCACHE +@WITH_FILEFACE_TRUE@am__append_5 = $(GRAPHITE2_SRC)/FileFace.cpp +@WITH_FILEFACE_FALSE@am__append_6 = -DGRAPHITE2_NFILEFACE +@WITH_TRACING_TRUE@am__append_7 = $(GRAPHITE2_SRC)/json.cpp +@WITH_TRACING_FALSE@am__append_8 = -DGRAPHITE2_NTRACING subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -434,7 +437,8 @@ SUBDIRS = . include/graphite2 noinst_LIBRARIES = libgraphite2.a AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE2_SRC) \ -I$(top_srcdir)/$(GRAPHITE2_INC) -DGRAPHITE2_STATIC \ - -DGRAPHITE2_CUSTOM_HEADER='' + -DGRAPHITE2_CUSTOM_HEADER='' $(am__append_4) \ + $(am__append_6) $(am__append_8) libgraphite2_a_SOURCES = $(GRAPHITE2_SRC)/Bidi.cpp \ $(GRAPHITE2_SRC)/CachedFace.cpp $(GRAPHITE2_SRC)/CmapCache.cpp \ $(GRAPHITE2_SRC)/Code.cpp $(GRAPHITE2_SRC)/Face.cpp \ @@ -472,7 +476,7 @@ libgraphite2_a_SOURCES = $(GRAPHITE2_SRC)/Bidi.cpp \ $(GRAPHITE2_SRC)/inc/locale2lcid.h \ $(GRAPHITE2_SRC)/inc/opcode_table.h \ $(GRAPHITE2_SRC)/inc/opcodes.h $(am__append_1) $(am__append_2) \ - $(am__append_3) $(am__append_4) $(am__append_5) + $(am__append_3) $(am__append_5) $(am__append_7) DISTCLEANFILES = config.force LDADD = libgraphite2.a all: config.h -- cgit v1.2.3