summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2013-10-18 23:23:02 +0200
committerStef Walter <stefw@gnome.org>2013-10-18 23:23:02 +0200
commit90e556664788441b4eeb79927f82755ef1734fa3 (patch)
tree8222fa900e1223c5773daca147b23431b7975e69
parentcbd62a66041b851dc7ff2c3e541ca393cef9e34c (diff)
downloadgcr-90e556664788441b4eeb79927f82755ef1734fa3.tar.gz
Use AM_CPPFLAGS instead of INCLUDES in Makefile.am files
-rw-r--r--egg/Makefile.am2
-rw-r--r--egg/tests/Makefile.am2
-rw-r--r--gck/Makefile.am2
-rw-r--r--gck/tests/Makefile.am2
-rw-r--r--gcr/Makefile.am2
-rw-r--r--gcr/tests/Makefile.am2
-rw-r--r--ui/Makefile.am2
-rw-r--r--ui/tests/Makefile.am2
8 files changed, 8 insertions, 8 deletions
diff --git a/egg/Makefile.am b/egg/Makefile.am
index 6b09a44..0e49fc8 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = \
libegg-secmem.la \
libegg-test.la
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/build \
diff --git a/egg/tests/Makefile.am b/egg/tests/Makefile.am
index 322b08f..e96a722 100644
--- a/egg/tests/Makefile.am
+++ b/egg/tests/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DSRCDIR="\"@abs_srcdir@\"" \
diff --git a/gck/Makefile.am b/gck/Makefile.am
index 0f3cf2a..2c28653 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -15,7 +15,7 @@ inc_HEADERS = \
pkcs11n.h \
pkcs11x.h
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)/gcr \
-I$(top_srcdir) \
diff --git a/gck/tests/Makefile.am b/gck/tests/Makefile.am
index 12cde2e..60da135 100644
--- a/gck/tests/Makefile.am
+++ b/gck/tests/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DSRCDIR="\"@abs_srcdir@\"" \
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 6e29021..97de672 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . tests
incdir = $(includedir)/gcr-@GCR_MAJOR@/gcr
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
diff --git a/gcr/tests/Makefile.am b/gcr/tests/Makefile.am
index 35fc63c..53f3fcd 100644
--- a/gcr/tests/Makefile.am
+++ b/gcr/tests/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DSRCDIR="\"@abs_srcdir@\"" \
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 0acb28c..4216d5c 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -7,7 +7,7 @@ incdir = $(includedir)/gcr-@GCR_MAJOR@/ui
EXTRA_DIST =
CLEANFILES =
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
diff --git a/ui/tests/Makefile.am b/ui/tests/Makefile.am
index f749ea9..8b6e34b 100644
--- a/ui/tests/Makefile.am
+++ b/ui/tests/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DSRCDIR="\"@abs_srcdir@\"" \