From c5ec98a0180e157892d929d38ee1de8bde1d30f1 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sun, 19 Jul 2015 19:33:34 +0200 Subject: [PATCH] Makefile.am: fix automake warning It fixes this warning: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') it seems INCLUDES is not to be used anymore. --- bindings/java/Makefile.am | 2 +- bindings/perl/Makefile.am | 2 +- bindings/php5/Makefile.am | 2 +- bindings/python/Makefile.am | 2 +- lasso/Makefile.am | 4 ++-- lasso/id-ff/Makefile.am | 2 +- lasso/id-wsf-2.0/Makefile.am | 2 +- lasso/id-wsf/Makefile.am | 2 +- lasso/saml-2.0/Makefile.am | 2 +- lasso/xml/Makefile.am | 2 +- lasso/xml/dsig/Makefile.am | 2 +- lasso/xml/id-wsf-2.0/Makefile.am | 2 +- lasso/xml/saml-2.0/Makefile.am | 2 +- lasso/xml/soap-1.1/Makefile.am | 2 +- lasso/xml/ws/Makefile.am | 2 +- tests/Makefile.am | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index f48f1189..1703dbfd 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -1,7 +1,7 @@ .NOTPARALLEL: MAINTAINERCLEANFILES = Makefile.in -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(SASL_CFLAGS) diff --git a/bindings/perl/Makefile.am b/bindings/perl/Makefile.am index 1c0f3457..03858759 100644 --- a/bindings/perl/Makefile.am +++ b/bindings/perl/Makefile.am @@ -18,7 +18,7 @@ TESTS_ENVIRONMENT=TOP_SRCDIR=$(top_srcdir) TESTS = test.sh if PERL_ENABLED -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(SASL_CFLAGS) diff --git a/bindings/php5/Makefile.am b/bindings/php5/Makefile.am index e39ea4ae..653aae8d 100644 --- a/bindings/php5/Makefile.am +++ b/bindings/php5/Makefile.am @@ -2,7 +2,7 @@ CLEANFILES = lasso.php php_lasso.h _lasso.c DISTCLEANFILES = __init__.pyc lang.pyc php_code.pyc wrapper_header.pyc wrapper_top.pyc wrapper_source.pyc SUBDIRS = examples tests -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(SASL_CFLAGS) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 762bbd13..61fc6cb6 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -4,7 +4,7 @@ DISTCLEANFILES = __init__.pyc lasso.pyc lang.pyc SUBDIRS = tests if PYTHON_ENABLED -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(SASL_CFLAGS) diff --git a/lasso/Makefile.am b/lasso/Makefile.am index 61728475..008bdbba 100644 --- a/lasso/Makefile.am +++ b/lasso/Makefile.am @@ -5,11 +5,11 @@ endif liblassoincludedir = $(includedir)/lasso -INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(LASSO_CORE_CFLAGS) +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(LASSO_CORE_CFLAGS) ## Added to activate libtool 1.5.6 windows resources partial support LTRCCOMPILE = $(LIBTOOL) --tag=RC --mode=compile $(RC) \ - `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) |\ + `echo $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) |\ sed -e 's/-I/--include-dir /g;s/-D/--define /g'` ## Added to activate libtool 1.5.6 windows resources partial support diff --git a/lasso/id-ff/Makefile.am b/lasso/id-ff/Makefile.am index 0f20b02c..34996c01 100644 --- a/lasso/id-ff/Makefile.am +++ b/lasso/id-ff/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/id-ff -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/id-wsf-2.0/Makefile.am b/lasso/id-wsf-2.0/Makefile.am index db2ef791..89b6bdd3 100644 --- a/lasso/id-wsf-2.0/Makefile.am +++ b/lasso/id-wsf-2.0/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/id-wsf-2.0 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/id-wsf/Makefile.am b/lasso/id-wsf/Makefile.am index d9464a23..88128713 100644 --- a/lasso/id-wsf/Makefile.am +++ b/lasso/id-wsf/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/id-wsf -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/saml-2.0/Makefile.am b/lasso/saml-2.0/Makefile.am index 8a12d51e..286353e7 100644 --- a/lasso/saml-2.0/Makefile.am +++ b/lasso/saml-2.0/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/saml-2.0 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am index 515c3c5b..6e34ae06 100644 --- a/lasso/xml/Makefile.am +++ b/lasso/xml/Makefile.am @@ -6,7 +6,7 @@ endif liblassoincludedir = $(includedir)/lasso/xml -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/xml/dsig/Makefile.am b/lasso/xml/dsig/Makefile.am index 5b24736f..5d9e3164 100644 --- a/lasso/xml/dsig/Makefile.am +++ b/lasso/xml/dsig/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/xml/dsig -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/xml/id-wsf-2.0/Makefile.am b/lasso/xml/id-wsf-2.0/Makefile.am index 7a92d4e0..b3087f05 100644 --- a/lasso/xml/id-wsf-2.0/Makefile.am +++ b/lasso/xml/id-wsf-2.0/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/xml/id-wsf-2.0 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/xml/saml-2.0/Makefile.am b/lasso/xml/saml-2.0/Makefile.am index 3a4fb1e5..a28dc7c0 100644 --- a/lasso/xml/saml-2.0/Makefile.am +++ b/lasso/xml/saml-2.0/Makefile.am @@ -2,7 +2,7 @@ EXTRA_DIST = xml_saml2.h MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/xml/saml-2.0 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/xml/soap-1.1/Makefile.am b/lasso/xml/soap-1.1/Makefile.am index 22e6c4b9..03e20a5f 100644 --- a/lasso/xml/soap-1.1/Makefile.am +++ b/lasso/xml/soap-1.1/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/xml/soap-1.1 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/lasso/xml/ws/Makefile.am b/lasso/xml/ws/Makefile.am index 79cd9ded..9388d7fd 100644 --- a/lasso/xml/ws/Makefile.am +++ b/lasso/xml/ws/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in liblassoincludedir = $(includedir)/lasso/xml/ws -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ $(LASSO_CORE_CFLAGS) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 50ace250..6d867851 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,7 +12,7 @@ TESTS = tests tests2 noinst_PROGRAMS = tests perfs tests2 -INCLUDES = \ +AM_CPPFLAGS = \ -DPACKAGE=\"@PACKAGE@\" \ -DTESTSDATADIR=\"$(srcdir)/data/\" \ -DTESTSMETADATADIR=\"$(srcdir)/data/metadata/\" \