diff options
author | Davide Madrisan <davide.madrisan@gmail.com> | 2014-03-08 17:17:27 +0100 |
---|---|---|
committer | Jan Wagner <waja@cyconet.org> | 2014-03-09 11:02:18 +0100 |
commit | 546e15a8e8a0250a1c2eb8f48490a3ef3d98bdeb (patch) | |
tree | d2265401be773bd208fe90ccd5253c5625500f87 /lib | |
parent | 0c5b362c3047c30326a748b154bc692b083d38ed (diff) | |
download | monitoring-plugins-546e15a8e8a0250a1c2eb8f48490a3ef3d98bdeb.tar.gz |
build - avoid deprecated INCLUDES
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile.am | 5 | ||||
-rw-r--r-- | lib/tests/Makefile.am | 5 |
2 files changed, 4 insertions, 6 deletions
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 | |||
4 | 4 | ||
5 | noinst_LIBRARIES = libmonitoringplug.a | 5 | noinst_LIBRARIES = libmonitoringplug.a |
6 | 6 | ||
7 | AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" | 7 | AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ |
8 | -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins | ||
8 | 9 | ||
9 | libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c | 10 | libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c |
10 | EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h | 11 | 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 | |||
13 | libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c | 14 | libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c |
14 | endif USE_PARSE_INI | 15 | endif USE_PARSE_INI |
15 | 16 | ||
16 | INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins | ||
17 | |||
18 | test test-debug: | 17 | test test-debug: |
19 | cd tests && make $@ | 18 | cd tests && make $@ |
20 | 19 | ||
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@ | |||
5 | TESTS = @EXTRA_TEST@ | 5 | TESTS = @EXTRA_TEST@ |
6 | check_PROGRAMS = @EXTRA_TEST@ | 6 | check_PROGRAMS = @EXTRA_TEST@ |
7 | 7 | ||
8 | AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" | 8 | AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \ |
9 | 9 | -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins | |
10 | INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins | ||
11 | 10 | ||
12 | EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 | 11 | EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 |
13 | 12 | ||