From 546e15a8e8a0250a1c2eb8f48490a3ef3d98bdeb Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Sat, 8 Mar 2014 17:17:27 +0100 Subject: build - avoid deprecated INCLUDES Signed-off-by: Davide Madrisan --- lib/Makefile.am | 5 ++--- lib/tests/Makefile.am | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.am b/lib/Makefile.am index 1515312c..01d73a64 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,7 +4,8 @@ SUBDIRS = . tests noinst_LIBRARIES = libmonitoringplug.a -AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" +AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ + -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h @@ -13,8 +14,6 @@ if USE_PARSE_INI libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c endif USE_PARSE_INI -INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins - test test-debug: cd tests && make $@ diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index c0411ac5..a8d7adee 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -5,9 +5,8 @@ noinst_PROGRAMS = @EXTRA_TEST@ TESTS = @EXTRA_TEST@ check_PROGRAMS = @EXTRA_TEST@ -AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" - -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins +AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ + -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 -- cgit v1.2.3