[PATCH libXt 2/2] Use AM_CPPFLAGS instead of INCLUDES

Thierry Reding thierry.reding at avionic-design.de
Thu Jan 3 01:16:56 PST 2013


Recent versions of automake deprecate the INCLUDES variable. The same
effect can be achieved by using AM_CPPFLAGS instead, which is also
automake's recommendation.

Signed-off-by: Thierry Reding <thierry.reding at avionic-design.de>
---
 src/Makefile.am  | 4 ++--
 test/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index de60cfc..a466ae5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,8 @@ ERRORDB_DEFINES = -DERRORDB=\"$(ERRORDBDIR)/XtErrorDB\"
 AM_CFLAGS = $(CWARNFLAGS) $(XT_CFLAGS) $(SRCH_DEFINES) $(ERRORDB_DEFINES) \
 	$(XTMALLOC_ZERO_CFLAGS)
 
-INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11 \
-	   -I$(top_builddir)/include -I$(top_builddir)/include/X11
+AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11 \
+	      -I$(top_builddir)/include -I$(top_builddir)/include/X11
 
 nodist_libXt_la_SOURCES = StringDefs.c
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 7494c41..adc7060 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,7 +5,7 @@ check_PROGRAMS = Alloc Converters Event
 TESTS=$(check_PROGRAMS)
 
 AM_CFLAGS = $(CWARNFLAGS) $(XT_CFLAGS) $(GLIB_CFLAGS)
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 LDADD= $(top_builddir)/src/libXt.la $(GLIB_LIBS)
 
 TESTS_ENVIRONMENT = $(MALLOC_DEBUG_ENV)
-- 
1.8.0.2



More information about the xorg-devel mailing list