summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile.am5
-rw-r--r--lib/tests/Makefile.am5
-rw-r--r--plugins/Makefile.am11
3 files changed, 10 insertions, 11 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1515312..01d73a6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,7 +4,8 @@ SUBDIRS = . tests
4 4
5noinst_LIBRARIES = libmonitoringplug.a 5noinst_LIBRARIES = libmonitoringplug.a
6 6
7AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" 7AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
8 -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
8 9
9libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c 10libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
10EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h 11EXTRA_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
13libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c 14libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c
14endif USE_PARSE_INI 15endif USE_PARSE_INI
15 16
16INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
17
18test test-debug: 17test 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 c0411ac..a8d7ade 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -5,9 +5,8 @@ noinst_PROGRAMS = @EXTRA_TEST@
5TESTS = @EXTRA_TEST@ 5TESTS = @EXTRA_TEST@
6check_PROGRAMS = @EXTRA_TEST@ 6check_PROGRAMS = @EXTRA_TEST@
7 7
8AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" 8AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
9 9 -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
10INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
11 10
12EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 11EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3
13 12
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 368876e..6b347fe 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -13,7 +13,8 @@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
13 13
14VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 14VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
15 15
16INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 16AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \
17 @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
17 18
18localedir = $(datadir)/locale 19localedir = $(datadir)/locale
19# gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this 20# gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this
@@ -81,11 +82,11 @@ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
81check_load_LDADD = $(BASEOBJS) 82check_load_LDADD = $(BASEOBJS)
82check_mrtg_LDADD = $(BASEOBJS) 83check_mrtg_LDADD = $(BASEOBJS)
83check_mrtgtraf_LDADD = $(BASEOBJS) 84check_mrtgtraf_LDADD = $(BASEOBJS)
84check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"' 85check_mysql_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS)
85check_mysql_CPPFLAGS = $(MYSQLINCLUDE) 86check_mysql_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE)
86check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS) 87check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
87check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"' 88check_mysql_query_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS)
88check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE) 89check_mysql_query_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE)
89check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS) 90check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
90check_nagios_LDADD = $(BASEOBJS) 91check_nagios_LDADD = $(BASEOBJS)
91check_nt_LDADD = $(NETLIBS) 92check_nt_LDADD = $(NETLIBS)