- replace INCLUDES by AM_CPPFLAGS

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 18d4ef393c952d8112e2064ff9699b7f96c4c770..22ef8ecaa3e441465ef7d269c8c5010f6f2db987 100644 (file)
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -8,7 +8,7 @@ AM_CXXFLAGS = -fPIC -DPIC
 
 PYLIBVER ?= python$(PYTHON_VERSION)
 
-INCLUDES = -I. -I${top_srcdir} -I/usr/include/$(PYLIBVER)
+AM_CPPFLAGS = -I. -I${top_srcdir} -I/usr/include/$(PYLIBVER)
 
 DEPENDENCIES =                                         \
        ${top_srcdir}/snapper/Factory.h                 \
@@ -34,6 +34,6 @@ _libsnapper_la_DEPENDENCIES =                         \
 nodist__libsnapper_la_SOURCES = libsnapper_wrap.cxx
 
 libsnapper.py libsnapper_wrap.cxx: libsnapper.i $(DEPENDENCIES)
-       swig -o libsnapper_wrap.cxx -c++ -python ${INCLUDES} libsnapper.i
+       swig -o libsnapper_wrap.cxx -c++ -python ${AM_CPPFLAGS} libsnapper.i
 
 CLEANFILES = libsnapper.py libsnapper_wrap.cxx

diff --git a/client/Makefile.am b/client/Makefile.am
index ed05cc2d9dd732b1e6ebcf61fa86b0bdce2a3a40..af0c99169f3877ca4e1d34583844c1844a8f6990 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -4,7 +4,7 @@
 
 SUBDIRS = utils
 
-INCLUDES = -I$(top_srcdir) $(DBUS_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
 bin_PROGRAMS = snapper
 

diff --git a/client/utils/Makefile.am b/client/utils/Makefile.am
index 020137dcf1bd077ca308b429a2c8453f222569c7..7554e3a434d91951b9f1c41c5c37225356fb2d53 100644 (file)
--- a/client/utils/Makefile.am
+++ b/client/utils/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/client/utils
 #
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libutils.la
 

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 2b104bcc374e67533f911067767aaf7b83fe0ff5..eb8769d314c00f19391232f5e06fd8df12afc016 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/dbus
 #
 
-INCLUDES = -I$(top_srcdir) $(DBUS_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
 noinst_LTLIBRARIES = libdbus.la
 

diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am
index 03d1b33045a7a27f8902ee5ecaaf7fbdbb1d1ac0..613c26ad614e50589fea05170c94932768b1e3e2 100644 (file)
--- a/examples/c++-lib/Makefile.am
+++ b/examples/c++-lib/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/examples/c++-lib
 #
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 LDADD = ../../snapper/libsnapper.la
 

diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
index 3b9d6b0c2f03b86f23040e109bcbb26c75958182..a81ca409ad598d9e888495ee689c5b367fae64fe 100644 (file)
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/examples/c
 #
 
-INCLUDES = -I$(top_srcdir) $(DBUS_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
 noinst_PROGRAMS = csnap
 

diff --git a/pam/Makefile.am b/pam/Makefile.am
index 6e8bddf0bc23a26fed8481c6d449f735149e3cca..befccf8584b8408a4a6bc3e50508a6ced37665f2 100644 (file)
--- a/pam/Makefile.am
+++ b/pam/Makefile.am
@@ -6,7 +6,7 @@ if HAVE_PAM
 
 AM_CFLAGS = -D_GNU_SOURCE -Wwrite-strings
 
-INCLUDES = -I$(top_srcdir) $(DBUS_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
 securelibdir = $(shell echo /`basename $(libdir)`/security)
 

diff --git a/server/Makefile.am b/server/Makefile.am
index 00d1e8150abb0141142ae0800b574763f7110de1..03344263bf59a23cfdcd3998f2e13a75c2a39c0f 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -2,8 +2,7 @@
 # Makefile.am for snapper/server
 #
 
-INCLUDES = -I$(top_srcdir) $(DBUS_CFLAGS)
-
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
 
 sbin_PROGRAMS = snapperd
 

diff --git a/snapper/Makefile.am b/snapper/Makefile.am
index 1969dd4944539e45ef08cb17fc4e4895127b4682..70104b35341ca4bdb155233b249299d9a08d8574 100644 (file)
--- a/snapper/Makefile.am
+++ b/snapper/Makefile.am
@@ -4,7 +4,7 @@
 
 AM_CXXFLAGS = -D_FILE_OFFSET_BITS=64
 
-INCLUDES = -I/usr/include/libxml2
+AM_CPPFLAGS = -I/usr/include/libxml2
 
 lib_LTLIBRARIES = libsnapper.la
 

diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
index 14df3a5b3f53b663a76c7e2f4496a17a5252afba..555bc3bfc47a1bc2e47ab5e0a96379abfe1bcfaa 100644 (file)
--- a/testsuite-cmp/Makefile.am
+++ b/testsuite-cmp/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/testsuite-cmp
 #
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 LDADD = ../snapper/libsnapper.la
 

diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
index 6de5563c5fed05ad5fd48d9321ab6acbab98f672..cb37a6a3a85483b1cac0b3ffc3278a359228dfa6 100644 (file)
--- a/testsuite-real/Makefile.am
+++ b/testsuite-real/Makefile.am
@@ -4,7 +4,7 @@
 
 CXXFLAGS += -std=gnu++0x
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 LDADD = ../snapper/libsnapper.la
 

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index f0f38d8de4684ae1cf7fc5ba439dd1eeb21a1c50..7477dc7b22c0cf7d1ce451ac25909f8a7414a6ce 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/testsuite
 #
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 LDADD = ../snapper/libsnapper.la -lboost_unit_test_framework