build: avoid using 'INCLUDES' in Makefile.am

Avoids warnings during build; e.g.:
    warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
This commit is contained in:
Aleksander Morgado
2014-06-22 17:56:56 +02:00
parent 9e93e22482
commit a691eec6ca
2 changed files with 18 additions and 12 deletions

View File

@@ -3,10 +3,6 @@ include $(top_srcdir)/gtester.make
noinst_PROGRAMS = test-qcdm modepref ipv6pref noinst_PROGRAMS = test-qcdm modepref ipv6pref
TEST_PROGS += test-qcdm TEST_PROGS += test-qcdm
INCLUDES = \
-I$(top_srcdir)/libqcdm/src \
-I$(top_srcdir)/src
test_qcdm_SOURCES = \ test_qcdm_SOURCES = \
test-qcdm-crc.c \ test-qcdm-crc.c \
test-qcdm-crc.h \ test-qcdm-crc.h \
@@ -19,15 +15,24 @@ test_qcdm_SOURCES = \
test-qcdm-result.c \ test-qcdm-result.c \
test-qcdm-result.h \ test-qcdm-result.h \
test-qcdm.c test-qcdm.c
test_qcdm_CPPFLAGS = $(MM_CFLAGS) test_qcdm_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir)/libqcdm/src \
-I$(top_srcdir)/src
test_qcdm_LDADD = $(MM_LIBS) test_qcdm_LDADD = $(MM_LIBS)
modepref_SOURCES = modepref.c modepref_SOURCES = modepref.c
modepref_CPPFLAGS = $(MM_CFLAGS) modepref_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir)/libqcdm/src \
-I$(top_srcdir)/src
modepref_LDADD = $(MM_LIBS) modepref_LDADD = $(MM_LIBS)
ipv6pref_SOURCES = ipv6pref.c ipv6pref_SOURCES = ipv6pref.c
ipv6pref_CPPFLAGS = $(MM_CFLAGS) ipv6pref_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir)/libqcdm/src \
-I$(top_srcdir)/src
ipv6pref_LDADD = $(MM_LIBS) ipv6pref_LDADD = $(MM_LIBS)
if QCDM_STANDALONE if QCDM_STANDALONE

View File

@@ -3,10 +3,6 @@ include $(top_srcdir)/gtester.make
noinst_PROGRAMS = test-wmc noinst_PROGRAMS = test-wmc
TEST_PROGS += $(noinst_PROGRAMS) TEST_PROGS += $(noinst_PROGRAMS)
INCLUDES = \
-I$(top_srcdir)/libwmc/src \
-I$(top_srcdir)/src
test_wmc_SOURCES = \ test_wmc_SOURCES = \
test-wmc-crc.c \ test-wmc-crc.c \
test-wmc-crc.h \ test-wmc-crc.h \
@@ -17,7 +13,12 @@ test_wmc_SOURCES = \
test-wmc-com.c \ test-wmc-com.c \
test-wmc-com.h \ test-wmc-com.h \
test-wmc.c test-wmc.c
test_wmc_CPPFLAGS = $(MM_CFLAGS)
test_wmc_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir)/libwmc/src \
-I$(top_srcdir)/src
test_wmc_LDADD = $(MM_LIBS) test_wmc_LDADD = $(MM_LIBS)
if WMC_STANDALONE if WMC_STANDALONE