Fix up Makefile.am files for automake 1.13 warnings

diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index 945ed706b3992f8ab7556d1b87ff6b6d427acb7d..942bc12a57c28a52e377cafb899b298a419125f1 100644 (file)
--- 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 c0919a22cf418484f6719293bf50d7508fbb23ec..2e08e84d6508046df12aac8337a451183e47ece0 100644 (file)
--- 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 4a3eaee2f9a70773bd24efdbb283cfea546d9b96..6963850f432a42878cb35665d31e8691852771a5 100644 (file)
--- 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 6155b6d2d0dc68f1ffc75dddc7491ad6f2af862e..c8296ee73801ebc52076d286bc8deedd2e884e23 100644 (file)
--- 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 667bf12446332102b68f0f3171877f4435148dd3..9a5ab738e34b5538f9b7f40d2180a3ca4de4ea8c 100644 (file)
--- 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 264ea7cad734c574963e0df7c03e4681eeb9585d..4a3430c8f0f652ed57dc1142b58f2b160ef8702f 100644 (file)
--- 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 240bd7d9f34d0f27e9a9adc49fd698d489f3021b..abacab6048f2ed203dfb97f88fe0dbe49494826e 100644 (file)
--- 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 \