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 --- plugins/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'plugins/Makefile.am') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 368876ea..6b347fe9 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -13,7 +13,8 @@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t -INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ +AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \ + @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ localedir = $(datadir)/locale # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this @@ -81,11 +82,11 @@ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS) check_load_LDADD = $(BASEOBJS) check_mrtg_LDADD = $(BASEOBJS) check_mrtgtraf_LDADD = $(BASEOBJS) -check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"' -check_mysql_CPPFLAGS = $(MYSQLINCLUDE) +check_mysql_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS) +check_mysql_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE) check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS) -check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"' -check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE) +check_mysql_query_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS) +check_mysql_query_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE) check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS) check_nagios_LDADD = $(BASEOBJS) check_nt_LDADD = $(NETLIBS) -- cgit v1.2.3