summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/tests/Makefile.am4
-rw-r--r--p11-kit/Makefile.am2
-rw-r--r--p11-kit/tests/Makefile.am2
-rw-r--r--tools/Makefile.am2
-rw-r--r--tools/tests/Makefile.am2
-rw-r--r--trust/Makefile.am2
-rw-r--r--trust/tests/Makefile.am2
7 files changed, 8 insertions, 8 deletions
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index 945ed70..942bc12 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/build/Makefile.tests
COMMON = $(top_srcdir)/common
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(srcdir)/.. \
-I$(COMMON) \
@@ -34,7 +34,7 @@ LDADD += \
$(LIBTASN1_LIBS) \
$(NULL)
-INCLUDES += \
+AM_CPPFLAGS += \
$(LIBTASN1_CFLAGS) \
$(NULL)
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index c0919a2..2e08e84 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = . tests
COMMON = $(top_srcdir)/common
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(COMMON) \
-DP11_KIT_FUTURE_UNSTABLE_API \
diff --git a/p11-kit/tests/Makefile.am b/p11-kit/tests/Makefile.am
index 4a3eaee..6963850 100644
--- a/p11-kit/tests/Makefile.am
+++ b/p11-kit/tests/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/build/Makefile.tests
COMMON = $(top_srcdir)/common
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(srcdir)/.. \
-I$(COMMON) \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6155b6d..c8296ee 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = . tests
COMMON = $(top_srcdir)/common
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/common \
-I$(top_srcdir)/p11-kit \
diff --git a/tools/tests/Makefile.am b/tools/tests/Makefile.am
index 667bf12..9a5ab73 100644
--- a/tools/tests/Makefile.am
+++ b/tools/tests/Makefile.am
@@ -10,7 +10,7 @@ TOOLS = $(top_srcdir)/tools
TEST_RUNNER = libtool --mode=execute
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/p11-kit \
-I$(srcdir)/.. \
diff --git a/trust/Makefile.am b/trust/Makefile.am
index 264ea7c..4a3430c 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = . tests
COMMON = $(top_srcdir)/common
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/common \
-DDATADIR=\"$(datadir)\" \
diff --git a/trust/tests/Makefile.am b/trust/tests/Makefile.am
index 240bd7d..abacab6 100644
--- a/trust/tests/Makefile.am
+++ b/trust/tests/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/build/Makefile.tests
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(srcdir)/.. \
-I$(top_srcdir)/common \