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.
This commit is contained in:
Benjamin Dauvergne 2015-07-19 19:33:34 +02:00
parent 34ee3446e8
commit c5ec98a018
16 changed files with 17 additions and 17 deletions

View File

@ -1,7 +1,7 @@
.NOTPARALLEL:
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(SASL_CFLAGS)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
liblassoincludedir = $(includedir)/lasso/id-ff
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \

View File

@ -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) \

View File

@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
liblassoincludedir = $(includedir)/lasso/id-wsf
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \

View File

@ -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) \

View File

@ -6,7 +6,7 @@ endif
liblassoincludedir = $(includedir)/lasso/xml
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \

View File

@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
liblassoincludedir = $(includedir)/lasso/xml/dsig
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \

View File

@ -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) \

View File

@ -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) \

View File

@ -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) \

View File

@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
liblassoincludedir = $(includedir)/lasso/xml/ws
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
$(LASSO_CORE_CFLAGS) \

View File

@ -12,7 +12,7 @@ TESTS = tests tests2
noinst_PROGRAMS = tests perfs tests2
INCLUDES = \
AM_CPPFLAGS = \
-DPACKAGE=\"@PACKAGE@\" \
-DTESTSDATADIR=\"$(srcdir)/data/\" \
-DTESTSMETADATADIR=\"$(srcdir)/data/metadata/\" \