diff options
| -rw-r--r-- | boilerplate/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/public/Makefile.am | 5 | ||||
| -rw-r--r-- | perf/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
5 files changed, 8 insertions, 13 deletions
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am index b47b0612..866315f1 100644 --- a/boilerplate/Makefile.am +++ b/boilerplate/Makefile.am @@ -88,7 +88,7 @@ libcairoboilerplate_la_SOURCES += cairo-boilerplate-xlib.h libcairoboilerplate_la_SOURCES += cairo-boilerplate-xlib-private.h endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am index d2a65e1c..b1d113cc 100644 --- a/doc/public/Makefile.am +++ b/doc/public/Makefile.am @@ -26,11 +26,6 @@ IGNORE_HFILES= \ $(unsupported_cairo_headers) \ $(NULL) -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -INCLUDES = -GTKDOC_LIBS = - # Extra options to supply to gtkdoc-mkdb MKDB_OPTIONS=--sgml-mode --output-format=xml diff --git a/perf/Makefile.am b/perf/Makefile.am index aba38a3a..acafc7ab 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/boilerplate \ -I$(top_srcdir)/src \ diff --git a/src/Makefile.am b/src/Makefile.am index 7f9e11ec..0c8dccc5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = BUILT_SOURCES = -INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) +AM_CPPFLAGS = -I$(srcdir) $(CAIRO_CFLAGS) if OS_WIN32 export_symbols = -export-symbols cairo.def @@ -94,14 +94,14 @@ CLEANFILES += check-link # The pre-processed result is used by check-{def,plt}.sh to determine whether # cairo has been compiled with symbol hiding. .c.i: $(cairoinclude_HEADERS) $(nodist_cairoinclude_HEADERS) cairoint.h $(top_builddir)/config.h - $(CPP) -DHAVE_CONFIG_H -I$(top_builddir) -I. $(INCLUDES) $< -o $@ + $(CPP) -DHAVE_CONFIG_H -I$(top_builddir) -I. $(AM_CPPFLAGS) $< -o $@ CLEANFILES += *.i *.s SPARSE = sparse sparse: @status=true; for f in $(enabled_cairo_sources); do \ echo sparse $$f; \ - $(SPARSE) -I$(top_builddir) $(INCLUDES) -DHAVE_CONFIG_H $$f || status=false; \ + $(SPARSE) -I$(top_builddir) $(AM_CPPFLAGS) -DHAVE_CONFIG_H $$f || status=false; \ done; $$status SPLINT = splint -badflag @@ -109,12 +109,12 @@ splint: @status=true; for f in $(enabled_cairo_sources); do \ test "$$f" = "`echo "$$f" | sed 's/[.]h$$//'`" || continue; \ echo sparse $$f; \ - $(SPLINT) -I$(top_builddir) $(INCLUDES) -DHAVE_CONFIG_H $$f || status=false; \ + $(SPLINT) -I$(top_builddir) $(AM_CPPFLAGS) -DHAVE_CONFIG_H $$f || status=false; \ done; $$status UNO = uno uno: - @cpp_flags=`echo $(INCLUDES) | sed 's/\(-I.*\) /\1 /g'`; \ + @cpp_flags=`echo $(AM_CPPFLAGS) | sed 's/\(-I.*\) /\1 /g'`; \ files=`echo $(enabled_cairo_sources) | sed 's/[^ ]*\.h//g'`; \ $(UNO) -I$(top_builddir) $$cpp_flags -DHAVE_CONFIG_H -U__GNUC__ $$files diff --git a/test/Makefile.am b/test/Makefile.am index 3131c0a4..1d27dbdc 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -837,7 +837,7 @@ check-local: check_PROGRAMS = EXTRA_PROGRAMS = -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/pdiff \ -I$(top_srcdir)/boilerplate \ |