diff options
| author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-01-03 10:16:56 +0100 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-12 13:05:20 -0800 |
| commit | 6731c2c7e3c16ad17425acfb5024fa1501e94411 (patch) | |
| tree | 5e4ef7bb28b459d5a49494a9601569bf27e6acbe | |
| parent | 97034e393cfa63a55e9cec2d795ac41e5872f5b5 (diff) | |
| download | xorg-lib-libXt-6731c2c7e3c16ad17425acfb5024fa1501e94411.tar.gz | |
Use AM_CPPFLAGS instead of INCLUDES
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@avionic-design.de>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | 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) |