Commit 18bf57c7 authored by Sebastian Freundt's avatar Sebastian Freundt Committed by Akira TAGOH

build-chain, replace INCLUDES directive by AM_CPPFLAGS

As of automake-13.1 the INCLUDES directive is no longer supported.
An automake run will return with an error.

This changeset simply follows automake's advice to replace INCLUDES
by AM_CPPFLAGS.
parent 8fd0ed60
......@@ -32,7 +32,7 @@ TOOL=./$(DIR)$(EXEEXT_FOR_BUILD)
EXTRA_DIST = $(TARG) $(TMPL) $(TSRC) $(DIST)
INCLUDES = \
AM_CPPFLAGS = \
-I$(builddir) \
-I$(srcdir) \
-I$(top_builddir)/src \
......@@ -43,7 +43,7 @@ INCLUDES = \
$(WARN_CFLAGS)
$(TOOL): $(TSRC) $(ALIAS_FILES)
$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(INCLUDES)
$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS)
$(TARG): $(TMPL) $(TSRC) $(DEPS)
$(AM_V_GEN) $(MAKE) $(TOOL) && \
......
......@@ -36,7 +36,7 @@ uninstall-local:
-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
endif
INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
bin_PROGRAMS=fc-cache
......
......@@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat
SGML = ${FC_CAT_SRC}/fc-cat.sgml
INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
bin_PROGRAMS=fc-cat
......
......@@ -29,7 +29,7 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml
bin_PROGRAMS=fc-list
INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
BUILT_MANS=fc-list.1
......
......@@ -29,7 +29,7 @@ FC_MATCH_SRC=${top_srcdir}/fc-match
SGML = ${FC_MATCH_SRC}/fc-match.sgml
INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
BUILT_MANS=fc-match.1
......
......@@ -29,7 +29,7 @@ FC_PATTERN_SRC=${top_srcdir}/fc-pattern
SGML = ${FC_PATTERN_SRC}/fc-pattern.sgml
INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
BUILT_MANS=fc-pattern.1
......
......@@ -29,7 +29,7 @@ FC_QUERY_SRC=${top_srcdir}/fc-query
SGML = ${FC_QUERY_SRC}/fc-query.sgml
INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
BUILT_MANS=fc-query.1
......
......@@ -29,7 +29,7 @@ FC_SCAN_SRC=${top_srcdir}/fc-scan
SGML = ${FC_SCAN_SRC}/fc-scan.sgml
INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
BUILT_MANS=fc-scan.1
......
......@@ -29,7 +29,7 @@ FC_VALIDATE_SRC=${top_srcdir}/fc-validate
SGML = ${FC_VALIDATE_SRC}/fc-validate.sgml
INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
BUILT_MANS=fc-validate.1
......
......@@ -70,7 +70,7 @@ uninstall-ms-import-lib:
endif
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
$(FREETYPE_CFLAGS) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment