diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2014-06-22 17:56:56 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2014-06-22 18:24:21 +0200 |
| commit | a691eec6ca6b942152e11edb878a8c338c8b295b (patch) | |
| tree | e03b45d286190c4e866323bcad2204e0e20cf5c7 | |
| parent | 9e93e22482a0f418d48d7c3ecdaf38b75df0a775 (diff) | |
build: avoid using 'INCLUDES' in Makefile.am
Avoids warnings during build; e.g.:
warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| -rw-r--r-- | libqcdm/tests/Makefile.am | 19 | ||||
| -rw-r--r-- | libwmc/tests/Makefile.am | 11 |
2 files changed, 18 insertions, 12 deletions
diff --git a/libqcdm/tests/Makefile.am b/libqcdm/tests/Makefile.am index 241ae038..bbc5b719 100644 --- a/libqcdm/tests/Makefile.am +++ b/libqcdm/tests/Makefile.am @@ -3,10 +3,6 @@ include $(top_srcdir)/gtester.make noinst_PROGRAMS = test-qcdm modepref ipv6pref TEST_PROGS += test-qcdm -INCLUDES = \ - -I$(top_srcdir)/libqcdm/src \ - -I$(top_srcdir)/src - test_qcdm_SOURCES = \ test-qcdm-crc.c \ test-qcdm-crc.h \ @@ -19,15 +15,24 @@ test_qcdm_SOURCES = \ test-qcdm-result.c \ test-qcdm-result.h \ 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) 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) 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) if QCDM_STANDALONE diff --git a/libwmc/tests/Makefile.am b/libwmc/tests/Makefile.am index 09141a08..33eaf3de 100644 --- a/libwmc/tests/Makefile.am +++ b/libwmc/tests/Makefile.am @@ -3,10 +3,6 @@ include $(top_srcdir)/gtester.make noinst_PROGRAMS = test-wmc TEST_PROGS += $(noinst_PROGRAMS) -INCLUDES = \ - -I$(top_srcdir)/libwmc/src \ - -I$(top_srcdir)/src - test_wmc_SOURCES = \ test-wmc-crc.c \ test-wmc-crc.h \ @@ -17,7 +13,12 @@ test_wmc_SOURCES = \ test-wmc-com.c \ test-wmc-com.h \ 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) if WMC_STANDALONE |