diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-08-06 13:08:13 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-08-06 13:08:13 +1000 |
| commit | bbef8e46f2fed8f823ee4b97e96c3fcee28f3b75 (patch) | |
| tree | d5065903cadb6fb6a069b293a994b1b092cebc1e /test | |
| parent | c218ba8423a73a7a643cb17789db8a1dd0901ca6 (diff) | |
Replace INCLUDES with AM_CPPFLAGS
newer automake gets quite noisy about this.
hw/xfree86/ddc/Makefile.am:7: warning:
'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
and many more of these.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/xi2/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 34f53fc1e..eff0c9d81 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -13,9 +13,9 @@ TESTS=$(noinst_PROGRAMS) TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV) AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ -INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw +AM_CPPFLAGS = $(XORG_INCS) -I$(top_srcdir)/miext/cw if XORG -INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \ +AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/parser \ -I$(top_srcdir)/hw/xfree86/ddc \ -I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \ -I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/dri \ diff --git a/test/xi2/Makefile.am b/test/xi2/Makefile.am index 9de7abf5d..bfddfef13 100644 --- a/test/xi2/Makefile.am +++ b/test/xi2/Makefile.am @@ -17,7 +17,7 @@ TESTS=$(noinst_PROGRAMS) TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV) AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ -INCLUDES = @XORG_INCS@ +AM_CPPFLAGS = @XORG_INCS@ TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) COMMON_SOURCES=protocol-common.h protocol-common.c |