From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 11 Dec 2014 17:04:24 +0000 (+0100)
Subject: - replace INCLUDES by AM_CPPFLAGS
X-Git-Tag: v0.2.5~5^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=180fdbbe4c2201324ba776df0ef79a14eebd9035;p=thirdparty%2Fsnapper.git

- replace INCLUDES by AM_CPPFLAGS
---

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 18d4ef39..22ef8eca 100644
--- 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 ed05cc2d..af0c9916 100644
--- 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 020137dc..7554e3a4 100644
--- 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 2b104bcc..eb8769d3 100644
--- 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 03d1b330..613c26ad 100644
--- 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 3b9d6b0c..a81ca409 100644
--- 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 6e8bddf0..befccf85 100644
--- 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 00d1e815..03344263 100644
--- 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 1969dd49..70104b35 100644
--- 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 14df3a5b..555bc3bf 100644
--- 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 6de5563c..cb37a6a3 100644
--- 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 f0f38d8d..7477dc7b 100644
--- 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