"INCLUDES" replaced with per-module "_CPPFLAGS"
authorAlex Kirhenshtein <alk@netxms.org>
Thu, 17 Jan 2013 14:02:37 +0000 (14:02 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Thu, 17 Jan 2013 14:02:37 +0000 (14:02 +0000)
74 files changed:
src/agent/appagent/Makefile.am
src/agent/core/Makefile.am
src/agent/libnxsd/Makefile.am
src/agent/subagents/aix/Makefile.am
src/agent/subagents/darwin/Makefile.am
src/agent/subagents/ecs/Makefile.am
src/agent/subagents/freebsd/Makefile.am
src/agent/subagents/hpux/Makefile.am
src/agent/subagents/informix/Makefile.am
src/agent/subagents/ipso/Makefile.am
src/agent/subagents/linux/Makefile.am
src/agent/subagents/lmsensors/Makefile.am
src/agent/subagents/logwatch/Makefile.am
src/agent/subagents/netbsd/Makefile.am
src/agent/subagents/odbcquery/Makefile.am
src/agent/subagents/openbsd/Makefile.am
src/agent/subagents/oracle/Makefile.am
src/agent/subagents/ping/Makefile.am
src/agent/subagents/portCheck/Makefile.am
src/agent/subagents/sms/Makefile.am
src/agent/subagents/sunos/Makefile.am
src/agent/subagents/ups/Makefile.am
src/agent/tools/nxappget/Makefile.am
src/agent/tools/nxapush/Makefile.am
src/client/nxalarm/Makefile.am
src/client/nxevent/Makefile.am
src/client/nxpush/Makefile.am
src/client/nxsms/Makefile.am
src/db/dbdrv/db2/Makefile.am
src/db/dbdrv/informix/Makefile.am
src/db/dbdrv/mysql/Makefile.am
src/db/dbdrv/odbc/Makefile.am
src/db/dbdrv/oracle/Makefile.am
src/db/dbdrv/pgsql/Makefile.am
src/db/dbdrv/sqlite/Makefile.am
src/db/libnxdb/Makefile.am
src/libexpat/libexpat/Makefile.am
src/libnetxms/Makefile.am
src/libnxcl/Makefile.am
src/libnxlp/Makefile.am
src/libnxmap/Makefile.am
src/libnxsl/Makefile.am
src/nxscript/Makefile.am
src/server/core/Makefile.am
src/server/drivers/baystack/Makefile.am
src/server/drivers/cat2900xl/Makefile.am
src/server/drivers/catalyst/Makefile.am
src/server/drivers/cisco-esw/Makefile.am
src/server/drivers/dell-pwc/Makefile.am
src/server/drivers/ers8000/Makefile.am
src/server/drivers/lib/avaya-ers/Makefile.am
src/server/drivers/lib/cisco/Makefile.am
src/server/drivers/netscreen/Makefile.am
src/server/drivers/procurve/Makefile.am
src/server/libnxsrv/Makefile.am
src/server/netxmsd/Makefile.am
src/server/smsdrv/dummy/Makefile.am
src/server/smsdrv/generic/Makefile.am
src/server/smsdrv/nxagent/Makefile.am
src/server/smsdrv/portech/Makefile.am
src/server/tools/nxaction/Makefile.am
src/server/tools/nxadm/Makefile.am
src/server/tools/nxap/Makefile.am
src/server/tools/nxdbmgr/Makefile.am
src/server/tools/nxencpasswd/Makefile.am
src/server/tools/nxget/Makefile.am
src/server/tools/nxupload/Makefile.am
src/snmp/libnxsnmp/Makefile.am
src/snmp/nxmibc/Makefile.am
src/snmp/nxsnmpget/Makefile.am
src/snmp/nxsnmpset/Makefile.am
src/snmp/nxsnmpwalk/Makefile.am
src/sqlite/Makefile.am
src/tools/nxdevcfg/Makefile.am

index eea40f0..f4cdca1 100644 (file)
@@ -1,9 +1,9 @@
-INCLUDES=-I@top_srcdir@/include
 SOURCES = appagent.cpp client.cpp message.cpp
 
 lib_LTLIBRARIES = libappagent.la
 
 libappagent_la_SOURCES = $(SOURCES)
+libappagent_la_CPPFLAGS=-I@top_srcdir@/include
 libappagent_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libappagent_la_LIBADD = @top_srcdir@/src/libnetxms/libnetxms.la
 
index 83eaffc..57204db 100644 (file)
@@ -1,5 +1,4 @@
-INCLUDES=-I@top_srcdir@/include
-
+AM_CPPFLAGS=-I@top_srcdir@/include
 bin_PROGRAMS = nxagentd
 nxagentd_SOURCES = messages.c actions.cpp comm.cpp config.cpp epp.cpp exec.cpp \
                    extagent.cpp getparam.cpp master.cpp nxagentd.cpp \
@@ -18,7 +17,6 @@ else
 nxagentd_LDFLAGS = -static
 endif
 endif
-AM_CPPFLAGS = $(all_includes)
 CLEANFILES = messages.c messages.h static_subagents.cpp
 
 messages.c: messages.h
index fed76df..2d9359e 100644 (file)
@@ -1,9 +1,9 @@
-INCLUDES=-I@top_srcdir@/include
 SOURCES = main.cpp attr.cpp
 
 lib_LTLIBRARIES = libnxsd.la
 
 libnxsd_la_SOURCES = $(SOURCES)
+libnxsd_la_CPPFLAGS=-I@top_srcdir@/include
 libnxsd_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 
 EXTRA_DIST = libnxsd.h libnxsd.vcproj
index 85ca9eb..cc4301a 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = aix
 
 pkglib_LTLIBRARIES = aix.la
 aix_la_SOURCES = cpu.cpp disk.cpp iostat.cpp main.cpp net.cpp proc.cpp system.cpp
+aix_la_CPPFLAGS=-I@top_srcdir@/include
 aix_la_LDFLAGS = -module -avoid-version
 aix_la_LIBADD = -lperfstat ../../../libnetxms/libnetxms.la
 
index 99a3dfd..7fd9a1c 100644 (file)
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT=darwin
 
 pkglib_LTLIBRARIES=darwin.la
 darwin_la_SOURCES=darwin.cpp net.cpp system.cpp disk.cpp cpu.cpp
+darwin_la_CPPFLAGS=-I@top_srcdir@/include
 darwin_la_LDFLAGS=-module -avoid-version
 darwin_la_LIBADD=../../../libnetxms/libnetxms.la
 
index 7ef4640..20420fe 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = ecs
 
 pkglib_LTLIBRARIES = ecs.la
 ecs_la_SOURCES = ecs.cpp
+ecs_la_CPPFLAGS=-I@top_srcdir@/include
 ecs_la_LDFLAGS = -module -avoid-version
 ecs_la_LIBADD = ../../../libnetxms/libnetxms.la
 
index 4a16143..2c83e16 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = freebsd
 
 pkglib_LTLIBRARIES = freebsd.la
 freebsd_la_SOURCES = disk.cpp freebsd.cpp net.cpp proc.cpp system.cpp 
+freebsd_la_CPPFLAGS=-I@top_srcdir@/include
 freebsd_la_LDFLAGS = -module -avoid-version -lkvm
 freebsd_la_LIBADD = ../../../libnetxms/libnetxms.la
 
index 440ae4f..2bebc69 100644 (file)
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = hpux
 
 pkglib_LTLIBRARIES = hpux.la
 hpux_la_SOURCES = disk.cpp iostat.cpp main.cpp net.cpp proc.cpp system.cpp
-hpux_la_CPPFLAGS = -D_PSTAT64
+hpux_la_CPPFLAGS = -I@top_srcdir@/include -D_PSTAT64
 hpux_la_LIBADD = ../../../libnetxms/libnetxms.la -lnm
 hpux_la_LDFLAGS = -module -avoid-version -lnm
 
index b98f99c..d1d55e5 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = informix
 
 pkglib_LTLIBRARIES = informix.la
 informix_la_SOURCES = main.cpp
+informix_la_CPPFLAGS=-I@top_srcdir@/include
 informix_la_LDFLAGS = -module -avoid-version
 informix_la_LIBADD = ../../../libnetxms/libnetxms.la ../../../db/libnxdb/libnxdb.la
 
index 7b415b5..96d0ec2 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include
-
 lib_LTLIBRARIES = libnsm_ipso.la
 libnsm_ipso_la_SOURCES = disk.cpp ipso.cpp net.cpp system.cpp
+libnsm_ipso_CPPFLAGS=-I@top_srcdir@/include
 libnsm_ipso_la_LDFLAGS = -lkvm
 
 EXTRA_DIST = ipso.h
index 9e4c71a..338ee4e 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = linux
 
 pkglib_LTLIBRARIES = linux.la
 linux_la_SOURCES = cpu.cpp disk.cpp drbd.cpp hddinfo.cpp iostat.cpp linux.cpp net.cpp proc.cpp system.cpp
+linux_la_CPPFLAGS=-I@top_srcdir@/include
 linux_la_LDFLAGS = -module -avoid-version
 linux_la_LIBADD = ../../../libnetxms/libnetxms.la
 
index d0581ad..b6477ea 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = lmsensors
 
 pkglib_LTLIBRARIES = lmsensors.la
 lmsensors_la_SOURCES = main.cpp
+lmsensors_la_CPPFLAGS=-I@top_srcdir@/include
 lmsensors_la_LDFLAGS = -module -avoid-version
 lmsensors_la_LIBADD = ../../../libnetxms/libnetxms.la -lsensors
 
index 65df5cf..342b26a 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = logwatch
 
 pkglib_LTLIBRARIES = logwatch.la
 logwatch_la_SOURCES = main.cpp
+logwatch_la_CPPFLAGS=-I@top_srcdir@/include
 logwatch_la_LDFLAGS = -module -avoid-version
 logwatch_la_LIBADD = @top_srcdir@/src/libnetxms/libnetxms.la @top_srcdir@/src/libnxlp/libnxlp.la
 
index 447907a..44b7f93 100644 (file)
@@ -8,13 +8,13 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-INCLUDES=-I@top_srcdir@/include
 AM_CXXFLAGS=-fpermissive 
 
 SUBAGENT = netbsd
 
 pkglib_LTLIBRARIES = netbsd.la
 netbsd_la_SOURCES = netbsd.cpp system.cpp disk.cpp net.cpp proc.cpp proc2.cpp
+netbsd_la_CPPFLAGS=-I@top_srcdir@/include
 netbsd_la_LDFLAGS = -module -avoid-version -lkvm
 netbsd_la_LIBADD = ../../../libnetxms/libnetxms.la
 
index 8b258f7..34a2f8c 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = odbcquery
 
 pkglib_LTLIBRARIES = odbcquery.la
 odbcquery_la_SOURCES = odbcquery.cpp odbcsapi.cpp
+odbcquery_la_CPPFLAGS=-I@top_srcdir@/include
 odbcquery_la_LDFLAGS = -module -avoid-version
 odbcquery_la_LIBADD = ../../../libnetxms/libnetxms.la @ODBC_LIBS@
 
index 51573ce..42bae6b 100644 (file)
@@ -8,13 +8,13 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-INCLUDES=-I@top_srcdir@/include
 AM_CXXFLAGS=-fpermissive 
 
 SUBAGENT = openbsd
 
 pkglib_LTLIBRARIES = openbsd.la
 openbsd_la_SOURCES = openbsd.cpp system.cpp disk.cpp net.cpp
+openbsd_la_CPPFLAGS=-I@top_srcdir@/include
 openbsd_la_LDFLAGS = -module -avoid-version -lkvm
 openbsd_la_LIBADD = ../../../libnetxms/libnetxms.la
 
index f93ba5a..c358e27 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = oracle
 
 pkglib_LTLIBRARIES = oracle.la
 oracle_la_SOURCES = main.cpp
+oracle_la_CPPFLAGS=-I@top_srcdir@/include
 oracle_la_LDFLAGS = -module -avoid-version
 oracle_la_LIBADD = ../../../libnetxms/libnetxms.la ../../../db/libnxdb/libnxdb.la
 
index efdaffa..973396a 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = ping
 
 pkglib_LTLIBRARIES = ping.la
 ping_la_SOURCES = ping.cpp
+ping_la_CPPFLAGS=-I@top_srcdir@/include
 ping_la_LDFLAGS = -module -avoid-version
 ping_la_LIBADD = ../../../libnetxms/libnetxms.la
 
index 4688646..3439911 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = portcheck
 
 pkglib_LTLIBRARIES = portcheck.la
 portcheck_la_SOURCES = custom.cpp http.cpp main.cpp net.cpp pop3.cpp smtp.cpp ssh.cpp telnet.cpp
+portcheck_la_CPPFLAGS=-I@top_srcdir@/include
 portcheck_la_LDFLAGS = -module -avoid-version
 portcheck_la_LIBADD = ../../../libnetxms/libnetxms.la
 if USE_INTERNAL_LIBTRE
index a61de4a..c12cf2f 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = sms
 
 pkglib_LTLIBRARIES = sms.la
 sms_la_SOURCES = main.cpp sender.cpp
+sms_la_CPPFLAGS=-I@top_srcdir@/include
 sms_la_LDFLAGS = -module -avoid-version
 sms_la_LIBADD = ../../../libnetxms/libnetxms.la
 
index 5ffdb91..41d05d3 100644 (file)
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = sunos
 
 pkglib_LTLIBRARIES = sunos.la
 sunos_la_SOURCES = cpu.cpp disk.cpp iostat.cpp mac_dlpi.cpp main.cpp net.cpp process.cpp system.cpp
+sunos_la_CPPFLAGS=-I@top_srcdir@/include
 sunos_la_LDFLAGS = -module -avoid-version
 sunos_la_LIBADD = ../../../libnetxms/libnetxms.la
 
index 730fcf5..dc26b0d 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SUBAGENT = ups
 
 pkglib_LTLIBRARIES = ups.la
 ups_la_SOURCES = apc.cpp bcmxcp.cpp main.cpp microdowell.cpp serial.cpp ups.cpp 
+ups_la_CPPFLAGS=-I@top_srcdir@/include
 ups_la_LDFLAGS = -module -avoid-version
 ups_la_LIBADD= ../../../libnetxms/libnetxms.la
 
index 6dbc6d8..65a643f 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxappget
 nxappget_SOURCES = nxappget.cpp
+nxappget_CPPFLAGS=-I@top_srcdir@/include
 nxappget_LDADD = @top_srcdir@/src/libnetxms/libnetxms.la @top_srcdir@/src/agent/appagent/libappagent.la
 if STATIC_BUILD
 if ALL_STATIC
index be315bf..0df57ca 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxapush
 nxapush_SOURCES = nxapush.cpp
+nxapush_CPPFLAGS=-I@top_srcdir@/include
 nxapush_LDADD = @top_srcdir@/src/libnetxms/libnetxms.la
 if STATIC_BUILD
 if ALL_STATIC
index a1afa38..700cde3 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxalarm
 nxalarm_SOURCES = nxalarm.cpp
+nxalarm_CPPFLAGS=-I@top_srcdir@/include
 nxalarm_LDADD = ../../libnetxms/libnetxms.la ../../libnxmap/libnxmap.la ../../libnxcl/libnxcl.la
 
 EXTRA_DIST = nxalarm.vcproj nxalarm.h
index 3ff8164..ad275ee 100644 (file)
@@ -8,10 +8,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxevent
 nxevent_SOURCES = nxevent.cpp
+nxevent_CPPFLAGS=-I@top_srcdir@/include
 nxevent_LDADD = ../../libnetxms/libnetxms.la ../../libnxmap/libnxmap.la ../../libnxcl/libnxcl.la
 
 EXTRA_DIST = nxevent.vcproj nxevent.h
index 8771f91..0c7ad39 100644 (file)
@@ -8,10 +8,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxpush
 nxpush_SOURCES = nxpush.cpp
+nxpush_CPPFLAGS=-I@top_srcdir@/include
 nxpush_LDADD = ../../libnetxms/libnetxms.la ../../libnxmap/libnxmap.la ../../libnxcl/libnxcl.la
 
 EXTRA_DIST = nxpush.vcproj
index 97df06c..bc5d752 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxsms
 nxsms_SOURCES = nxsms.cpp
+nxsms_CPPFLAGS=-I@top_srcdir@/include
 nxsms_LDADD = ../../libnetxms/libnetxms.la ../../libnxmap/libnxmap.la ../../libnxcl/libnxcl.la
 
 EXTRA_DIST = nxsms.vcproj nxsms.h
index 97c2f25..fb44fe1 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = db2
 
 pkglib_LTLIBRARIES = db2.la
 db2_la_SOURCES = db2.cpp
+db2_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 db2_la_LDFLAGS = -module -avoid-version
 db2_la_LIBADD = ../../../libnetxms/libnetxms.la @DB2_LIBS@
 
index df0c6f5..443a80c 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = informix
 
 pkglib_LTLIBRARIES = informix.la
 informix_la_SOURCES = informix.cpp
+informix_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 informix_la_LDFLAGS = -module -avoid-version
 informix_la_LIBADD = ../../../libnetxms/libnetxms.la @INFORMIX_LIBS@
 
index a008b8c..049cd21 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = mysql
 
 pkglib_LTLIBRARIES = mysql.la
 mysql_la_SOURCES = mysql.cpp
+mysql_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 mysql_la_LDFLAGS = -module -avoid-version
 mysql_la_LIBADD = ../../../libnetxms/libnetxms.la @MYSQL_LIBS@
 
index 0ee9eac..5720b38 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = odbc
 
 pkglib_LTLIBRARIES = odbc.la
 odbc_la_SOURCES = odbc.cpp
+odbc_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 odbc_la_LDFLAGS = -module -avoid-version
 odbc_la_LIBADD = ../../../libnetxms/libnetxms.la @ODBC_LIBS@
 
index 703794c..fe72fbd 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = oracle
 
 pkglib_LTLIBRARIES = oracle.la
 oracle_la_SOURCES = oracle.cpp
+oracle_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 oracle_la_LDFLAGS = -module -avoid-version
 oracle_la_LIBADD = ../../../libnetxms/libnetxms.la @ORACLE_LIBS@
 
index 8cdf67b..aed93f8 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = pgsql
 
 pkglib_LTLIBRARIES = pgsql.la
 pgsql_la_SOURCES = pgsql.cpp
+pgsql_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 pgsql_la_LDFLAGS = -module -avoid-version
 pgsql_la_LIBADD = ../../../libnetxms/libnetxms.la @PGSQL_LIBS@
 
index 68b0eb0..fdbac7f 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include -I@top_srcdir@/src/sqlite
-
 DRIVER = sqlite
 
 pkglib_LTLIBRARIES = sqlite.la
 sqlite_la_SOURCES = sqlite.cpp
+sqlite_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include -I@top_srcdir@/src/sqlite
 sqlite_la_LDFLAGS = -module -avoid-version
 sqlite_la_LIBADD = ../../../libnetxms/libnetxms.la ../../../sqlite/libnxsqlite.la
 
index de2642e..dcfe65f 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include
-
 lib_LTLIBRARIES = libnxdb.la
 libnxdb_la_SOURCES = dbcp.cpp drivers.cpp main.cpp session.cpp
+libnxdb_la_CPPFLAGS=-I@top_srcdir@/include
 libnxdb_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxdb_la_LIBADD = ../../libnetxms/libnetxms.la
 
index 69480fa..fb660ec 100644 (file)
@@ -1,10 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
-
 SOURCES = xmlparse.c xmlrole.c xmltok.c xmltok_impl.c xmltok_ns.c
 lib_LTLIBRARIES = libnxexpat.la
 
 libnxexpat_la_SOURCES = $(SOURCES)
-libnxexpat_la_CPPFLAGS = -DHAVE_EXPAT_CONFIG_H -I..
+libnxexpat_la_CPPFLAGS = -I@top_srcdir@/include -DHAVE_EXPAT_CONFIG_H -I..
 libnxexpat_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 
 EXTRA_DIST = \
index 5c02c30..aad31a0 100644 (file)
@@ -1,7 +1,3 @@
-INCLUDES=-I@top_srcdir@/include
-if USE_INTERNAL_EXPAT
-INCLUDES += -I@top_srcdir@/src/libexpat/libexpat
-endif
 SOURCES = agent.cpp array.cpp base64.cpp config.cpp crypto.cpp dirw_unix.c \
          gen_uuid.c geolocation.cpp getopt.c dload.cpp hash.cpp ice.c \
          icmp.cpp log.cpp main.cpp md5.cpp message.cpp msgwq.cpp net.cpp \
@@ -13,6 +9,10 @@ SOURCES = agent.cpp array.cpp base64.cpp config.cpp crypto.cpp dirw_unix.c \
 lib_LTLIBRARIES = libnetxms.la
 
 libnetxms_la_SOURCES = $(SOURCES)
+libnetxms_la_CPPFLAGS=-I@top_srcdir@/include
+if USE_INTERNAL_EXPAT
+libnetxms_la_CPPFLAGS+=-I@top_srcdir@/src/libexpat/libexpat
+endif
 libnetxms_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnetxms_la_LIBADD =
 if USE_INTERNAL_EXPAT
index dfcf9a4..3102b1f 100644 (file)
@@ -1,5 +1,3 @@
-INCLUDES=-I@top_srcdir@/include
-
 SOURCES = actions.cpp agentcfg.cpp alarms.cpp cert.cpp comm.cpp \
           datacoll.cpp epp.cpp eventdb.cpp events.cpp graph.cpp \
           layer2.cpp main.cpp mib.cpp \
@@ -10,6 +8,7 @@ SOURCES = actions.cpp agentcfg.cpp alarms.cpp cert.cpp comm.cpp \
 lib_LTLIBRARIES = libnxcl.la
 
 libnxcl_la_SOURCES = $(SOURCES)
+libnxcl_la_CPPFLAGS=-I@top_srcdir@/include
 libnxcl_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxcl_la_LIBADD = ../libnetxms/libnetxms.la ../libnxmap/libnxmap.la
 
index fa6cd84..8bd8fdd 100644 (file)
@@ -1,18 +1,17 @@
-INCLUDES=-I@top_srcdir@/include
-if USE_INTERNAL_EXPAT
-INCLUDES += -I@top_srcdir@/src/libexpat/libexpat
-endif
-
 SOURCES = file.cpp main.cpp parser.cpp rule.cpp
 
 lib_LTLIBRARIES = libnxlp.la
 
 libnxlp_la_SOURCES = $(SOURCES)
+libnxlp_la_CPPFLAGS=-I@top_srcdir@/include
 libnxlp_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxlp_la_LIBADD = @top_srcdir@/src/libnetxms/libnetxms.la
+
 if USE_INTERNAL_EXPAT
+libnxlp_la_CPPFLAGS+=-I@top_srcdir@/src/libexpat/libexpat
 libnxlp_la_LIBADD += @top_srcdir@/src/libexpat/libexpat/libnxexpat.la
 endif
+
 if USE_INTERNAL_LIBTRE
 libnxlp_la_LIBADD += @top_srcdir@/src/libtre/libnxtre.la
 endif
index e520a91..27b7169 100644 (file)
@@ -1,10 +1,9 @@
-INCLUDES=-I@top_srcdir@/include
-
 SOURCES = element.cpp link.cpp main.cpp objlist.cpp
 
 lib_LTLIBRARIES = libnxmap.la
 
 libnxmap_la_SOURCES = $(SOURCES)
+libnxmap_la_CPPFLAGS=-I@top_srcdir@/include
 libnxmap_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxmap_la_LIBADD = ../libnetxms/libnetxms.la
 
index 4a56e88..a60a359 100644 (file)
@@ -1,11 +1,10 @@
-INCLUDES=-I@top_srcdir@/include
-
 lib_LTLIBRARIES = libnxsl.la
 libnxsl_la_SOURCES = lex.parser.cpp parser.tab.cpp \
                      array.cpp class.cpp compiler.cpp env.cpp functions.cpp \
                      instruction.cpp iterator.cpp lexer.cpp \
                     library.cpp main.cpp program.cpp stack.cpp value.cpp \
                     variable.cpp
+libnxsl_la_CPPFLAGS=-I@top_srcdir@/include
 libnxsl_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxsl_la_LIBADD = ../libnetxms/libnetxms.la
 if USE_INTERNAL_LIBTRE
index e6187b8..8f57c88 100644 (file)
@@ -8,10 +8,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxscript
 nxscript_SOURCES = class.cpp nxscript.cpp
+nxscript_CPPFLAGS=-I@top_srcdir@/include
 nxscript_LDADD = ../libnetxms/libnetxms.la ../libnxsl/libnxsl.la
 
 if USE_INTERNAL_LIBTRE
index 14b7b50..0e9aeb0 100644 (file)
@@ -1,7 +1,5 @@
 # vim:ts=3:sw=3
 
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 lib_LTLIBRARIES = libnxcore.la
 libnxcore_la_SOURCES =  acl.cpp agent.cpp agent_policy.cpp actions.cpp \
                        admin.cpp alarm.cpp audit.cpp ap_config.cpp \
@@ -28,6 +26,7 @@ libnxcore_la_SOURCES =  acl.cpp agent.cpp agent_policy.cpp actions.cpp \
                        tools.cpp tracert.cpp uniroot.cpp upload_job.cpp \
                        uptimecalc.cpp userdb.cpp userdb_objects.cpp \
                        vpnconn.cpp vrrp.cpp watchdog.cpp zone.cpp
+libnxcore_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 libnxcore_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxcore_la_LIBADD = ../../libnetxms/libnetxms.la \
                      ../../snmp/libnxsnmp/libnxsnmp.la \
index dc1fe7a..e56932e 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = baystack
 
 pkglib_LTLIBRARIES = baystack.la
 baystack_la_SOURCES = baystack.cpp
+baystack_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 baystack_la_LDFLAGS = -module -avoid-version
 baystack_la_LIBADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../lib/avaya-ers/libavaya-ers.la
 
index 64868df..e2f0130 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = cat2900xl
 
 pkglib_LTLIBRARIES = cat2900xl.la
 cat2900xl_la_SOURCES = cat2900xl.cpp
+cat2900xl_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 cat2900xl_la_LDFLAGS = -module -avoid-version
 cat2900xl_la_LIBADD = ../../../libnetxms/libnetxms.la \
                      ../../../snmp/libnxsnmp/libnxsnmp.la \
index 003e590..1d96fb9 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = catalyst
 
 pkglib_LTLIBRARIES = catalyst.la
 catalyst_la_SOURCES = catalyst.cpp
+catalyst_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 catalyst_la_LDFLAGS = -module -avoid-version
 catalyst_la_LIBADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../lib/cisco/libcisco.la
 
index 93e8117..d227c36 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = cisco-esw
 
 pkglib_LTLIBRARIES = cisco-esw.la
 cisco_esw_la_SOURCES = cisco-esw.cpp
+cisco_esw_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 cisco_esw_la_LDFLAGS = -module -avoid-version
 cisco_esw_la_LIBADD = ../../../libnetxms/libnetxms.la \
                      ../../../snmp/libnxsnmp/libnxsnmp.la \
index b5f3bc3..c3f9040 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = dell-pwc
 
 pkglib_LTLIBRARIES = dell-pwc.la
 dell_pwc_la_SOURCES = dell-pwc.cpp
+dell_pwc_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 dell_pwc_la_LDFLAGS = -module -avoid-version
 dell_pwc_la_LIBADD = ../../../libnetxms/libnetxms.la \
                      ../../../snmp/libnxsnmp/libnxsnmp.la \
index cffa855..70cb254 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = ers8000
 
 pkglib_LTLIBRARIES = ers8000.la
 ers8000_la_SOURCES = ers8000.cpp
+ers8000_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 ers8000_la_LDFLAGS = -module -avoid-version
 ers8000_la_LIBADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../lib/avaya-ers/libavaya-ers.la
 
index 2ce008d..fd7e75a 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 lib_LTLIBRARIES = libavaya-ers.la
 libavaya_ers_la_SOURCES = avaya-ers.cpp vlan-if.cpp
+libavaya_ers_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 libavaya_ers_la_LDFLAGS = -avoid-version
 libavaya_ers_la_LIBADD = ../../../../libnetxms/libnetxms.la \
                         ../../../../snmp/libnxsnmp/libnxsnmp.la \
index 40b00cc..9b17856 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 lib_LTLIBRARIES = libcisco.la
 libcisco_la_SOURCES = cisco.cpp
+libcisco_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 libcisco_la_LDFLAGS = -avoid-version
 libcisco_la_LIBADD = ../../../../libnetxms/libnetxms.la \
                     ../../../../snmp/libnxsnmp/libnxsnmp.la \
index d2c5437..6d111b2 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = netscreen
 
 pkglib_LTLIBRARIES = netscreen.la
 netscreen_la_SOURCES = netscreen.cpp
+netscreen_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 netscreen_la_LDFLAGS = -module -avoid-version
 netscreen_la_LIBADD = ../../../libnetxms/libnetxms.la \
                      ../../../snmp/libnxsnmp/libnxsnmp.la \
index 4592a8b..de9a44b 100644 (file)
@@ -1,9 +1,8 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 DRIVER = procurve
 
 pkglib_LTLIBRARIES = procurve.la
 procurve_la_SOURCES = procurve.cpp
+procurve_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 procurve_la_LDFLAGS = -module -avoid-version
 procurve_la_LIBADD = ../../../libnetxms/libnetxms.la \
                      ../../../snmp/libnxsnmp/libnxsnmp.la \
index 4c3a3f2..cca3430 100644 (file)
@@ -1,8 +1,7 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 lib_LTLIBRARIES = libnxsrv.la
 libnxsrv_la_SOURCES = messages.c agent.cpp apinfo.cpp iflist.cpp isc.cpp \
                       main.cpp ndd.cpp snmp.cpp snmpproxy.cpp vlan.cpp
+libnxsrv_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 libnxsrv_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxsrv_la_LIBADD = ../../libnetxms/libnetxms.la ../../snmp/libnxsnmp/libnxsnmp.la
 
index 8aafed5..1baedb3 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = netxmsd
 netxmsd_SOURCES = netxmsd.cpp
+netxmsd_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 netxmsd_LDADD = ../../libnetxms/libnetxms.la \
                 ../../snmp/libnxsnmp/libnxsnmp.la \
                 ../../libnxsl/libnxsl.la \
index 5cf3110..83184a2 100644 (file)
@@ -1,6 +1,5 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 lib_LTLIBRARIES = libnxsms_dummy.la
 libnxsms_dummy_la_SOURCES = main.cpp
+libnxsms_dummy_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 libnxsms_dummy_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxsms_dummy_la_LIBADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la
index 130d002..f6178b2 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 lib_LTLIBRARIES = libnxsms_generic.la
 libnxsms_generic_la_SOURCES = main.cpp pdumode.cpp
+libnxsms_generic_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 libnxsms_generic_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxsms_generic_la_LIBADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la
 
index b88304b..6ede031 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 lib_LTLIBRARIES = libnxsms_nxagent.la
 libnxsms_nxagent_la_SOURCES = main.cpp
+libnxsms_nxagent_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 libnxsms_nxagent_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxsms_nxagent_la_LIBADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la
 
index bd78ad5..7d9aed7 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include\r
-\r
 lib_LTLIBRARIES = libnxsms_portech.la\r
 libnxsms_portech_la_SOURCES = main.cpp pdumode.cpp\r
+libnxsms_portech_la_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include\r
 libnxsms_portech_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)\r
 libnxsms_portech_la_LIBADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la\r
 \r
index 71a23ec..d35a372 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxaction
 nxaction_SOURCES = nxaction.cpp
+nxaction_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxaction_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
index b9c7a32..e2a35e8 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxadm
 nxadm_SOURCES = comm.cpp nxadm.cpp
+nxadm_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxadm_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la @SERVER_LIBS@
 
 EXTRA_DIST = \
index 7b9cb47..1b752a8 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxap
 nxap_SOURCES = nxap.cpp
+nxap_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxap_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
index 9510e41..1f46839 100644 (file)
@@ -1,8 +1,7 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include -I@top_srcdir@/src/sqlite
-
 bin_PROGRAMS = nxdbmgr
 nxdbmgr_SOURCES = nxdbmgr.cpp check.cpp clear.cpp export.cpp import.cpp \
                   init.cpp mm.cpp reindex.cpp tables.cpp unlock.cpp upgrade.cpp
+nxdbmgr_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include -I@top_srcdir@/src/sqlite
 nxdbmgr_LDADD = ../../../libnetxms/libnetxms.la \
                 ../../../db/libnxdb/libnxdb.la \
                 ../../../libnxmap/libnxmap.la \
index fe07fa6..e279ea7 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxencpasswd
 nxencpasswd_SOURCES = nxencpasswd.cpp
+nxencpasswd_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxencpasswd_LDADD = ../../../libnetxms/libnetxms.la
 
 EXTRA_DIST = \
index 2629269..3ed457d 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxget
 nxget_SOURCES = nxget.cpp
+nxget_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxget_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
index 2e8b24b..09f3212 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxupload
 nxupload_SOURCES = nxupload.cpp
+nxupload_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxupload_LDADD = ../../../libnetxms/libnetxms.la ../../libnxsrv/libnxsrv.la ../../../snmp/libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
index 8122e12..fec9743 100644 (file)
@@ -1,12 +1,10 @@
-INCLUDES=-I@top_srcdir@/include
-
 SOURCES = ber.cpp engine.cpp main.cpp mib.cpp oid.cpp pdu.cpp \
           security.cpp transport.cpp variable.cpp zfile.cpp
 
 lib_LTLIBRARIES = libnxsnmp.la
 
 libnxsnmp_la_SOURCES = $(SOURCES)
-libnxsnmp_la_CPPFLAGS = 
+libnxsnmp_la_CPPFLAGS = -I@top_srcdir@/include
 libnxsnmp_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 libnxsnmp_la_LIBADD = ../../libnetxms/libnetxms.la
 
index 421fe8c..5eff4c0 100644 (file)
@@ -8,10 +8,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxmibc
 nxmibc_SOURCES = array.cpp lex.parser.cpp mibparse.cpp nxmibc.cpp parser.tab.cpp
+nxmibc_CPPFLAGS=-I@top_srcdir@/include
 nxmibc_LDADD = ../../libnetxms/libnetxms.la ../libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = nxmibc.vcproj nxmibc.h mibparse.h parser.l parser.y parser.tab.hpp
index 580f1d5..2327351 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxsnmpget
 nxsnmpget_SOURCES = nxsnmpget.cpp
+nxsnmpget_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxsnmpget_LDADD = ../../libnetxms/libnetxms.la ../libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
index de16034..435f9ad 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxsnmpset
 nxsnmpset_SOURCES = nxsnmpset.cpp
+nxsnmpset_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxsnmpset_LDADD = ../../libnetxms/libnetxms.la ../libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
index b6dd85a..d0e6fcf 100644 (file)
@@ -1,7 +1,6 @@
-INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
-
 bin_PROGRAMS = nxsnmpwalk
 nxsnmpwalk_SOURCES = nxsnmpwalk.cpp
+nxsnmpwalk_CPPFLAGS=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 nxsnmpwalk_LDADD = ../../libnetxms/libnetxms.la ../libnxsnmp/libnxsnmp.la
 
 EXTRA_DIST = \
index 71e1aee..2b9a94d 100644 (file)
@@ -1,8 +1,8 @@
-INCLUDES=-I@top_srcdir@/include
 SOURCES = sqlite3.c
 
 lib_LTLIBRARIES = libnxsqlite.la
 libnxsqlite_la_SOURCES = $(SOURCES)
+libnxsqlite_la_CPPFLAGS=-I@top_srcdir@/include
 libnxsqlite_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION)
 
 EXTRA_DIST = sqlite3.h sqlite3ext.h dllmain.c nxsqlite.vcproj
index c63f84d..d8b5cb9 100644 (file)
@@ -8,10 +8,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-INCLUDES=-I@top_srcdir@/include
-
 bin_PROGRAMS = nxdevcfg
 nxdevcfg_SOURCES = nxdevcfg.cpp
+nxdevcfg_CPPFLAGS=-I@top_srcdir@/include
 nxdevcfg_LDADD = ../../libnetxms/libnetxms.la
 
 if USE_INTERNAL_LIBTRE