From ea40e7fe24a3b410e38bbb18a0ca995ee19dae0e Mon Sep 17 00:00:00 2001 From: Ludovic Rousseau Date: Tue, 25 Sep 2012 22:57:52 +0200 Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES Fix autoreconf warnings: $ autoreconf -vis -Wall [...] src/common/Makefile.am:12: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/libopensc/Makefile.am:19: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/minidriver/Makefile.am:15: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/pkcs11/Makefile.am:10: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/pkcs15init/Makefile.am:36: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/scconf/Makefile.am:12: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/sm/Makefile.am:8: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/tests/Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/tools/Makefile.am:15: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') --- src/common/Makefile.am | 2 +- src/libopensc/Makefile.am | 4 ++-- src/minidriver/Makefile.am | 2 +- src/pkcs11/Makefile.am | 2 +- src/pkcs15init/Makefile.am | 4 ++-- src/scconf/Makefile.am | 2 +- src/sm/Makefile.am | 2 +- src/tests/Makefile.am | 2 +- src/tools/Makefile.am | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 0b2fe9fc..baa09a11 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -9,7 +9,7 @@ dist_noinst_DATA = \ compat_getopt_main.c \ README.compat_strlcpy compat_strlcpy.3 -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src libcompat_la_SOURCES = \ compat_dummy.c \ diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am index 06689de0..538b1677 100644 --- a/src/libopensc/Makefile.am +++ b/src/libopensc/Makefile.am @@ -13,10 +13,10 @@ noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem. authentic.h iasecc.h iasecc-sdo.h sm.h card-sc-hsm.h \ pace.h -AM_CPPFLAGS = -DOPENSC_CONF_PATH=\"$(sysconfdir)/opensc.conf\" +AM_CPPFLAGS = -DOPENSC_CONF_PATH=\"$(sysconfdir)/opensc.conf\" \ + -I$(top_srcdir)/src AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \ $(OPTIONAL_PCSC_CFLAGS) $(OPTIONAL_ZLIB_CFLAGS) -INCLUDES = -I$(top_srcdir)/src libopensc_la_SOURCES = \ sc.c ctx.c log.c errors.c \ diff --git a/src/minidriver/Makefile.am b/src/minidriver/Makefile.am index d0161ef9..796795d0 100644 --- a/src/minidriver/Makefile.am +++ b/src/minidriver/Makefile.am @@ -12,7 +12,7 @@ else dist_noinst_DATA = opensc-minidriver.inf minidriver-westcos.reg minidriver-sc-hsm.reg endif -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src opensc_minidriver@LIBRARY_BITNESS@_la_SOURCES = minidriver.c minidriver.exports \ $(top_builddir)/win32/versioninfo.rc diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am index 287a46dc..da7499e4 100644 --- a/src/pkcs11/Makefile.am +++ b/src/pkcs11/Makefile.am @@ -7,7 +7,7 @@ dist_noinst_SCRIPTS = opensc_pkcs11_install.js lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(PTHREAD_CFLAGS) -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src OPENSC_PKCS11_INC = sc-pkcs11.h pkcs11.h pkcs11-opensc.h OPENSC_PKCS11_SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \ diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am index ffc56d37..7b2377bc 100644 --- a/src/pkcs15init/Makefile.am +++ b/src/pkcs15init/Makefile.am @@ -31,9 +31,9 @@ dist_pkgdata_DATA = \ iasecc_generic_pki.profile iasecc_admin_eid.profile iasecc_generic_oberthur.profile \ openpgp.profile -AM_CPPFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" +AM_CPPFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" \ + -I$(top_srcdir)/src AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) -INCLUDES = -I$(top_srcdir)/src libpkcs15init_la_SOURCES = \ pkcs15-lib.c profile.c \ diff --git a/src/scconf/Makefile.am b/src/scconf/Makefile.am index 235f30da..fa2e2716 100644 --- a/src/scconf/Makefile.am +++ b/src/scconf/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = internal.h scconf.h noinst_PROGRAMS = test-conf noinst_LTLIBRARIES = libscconf.la -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src libscconf_la_SOURCES = scconf.c parse.c write.c sclex.c diff --git a/src/sm/Makefile.am b/src/sm/Makefile.am index 0cce0a96..c48e9cea 100644 --- a/src/sm/Makefile.am +++ b/src/sm/Makefile.am @@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = Makefile.mak AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS) -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/include LIBS = $(top_builddir)/src/libopensc/libopensc.la $(top_builddir)/src/common/libcompat.la lib_LTLIBRARIES = libsmm-local.la diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 48ac6265..2fcc6861 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = Makefile.mak SUBDIRS = regression noinst_PROGRAMS = base64 lottery p15dump pintest prngtest -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src LIBS = \ $(top_builddir)/src/libopensc/libopensc.la \ $(top_builddir)/src/common/libscdl.la \ diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 783bb2a5..b42f8a4d 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -12,7 +12,7 @@ endif # compile with $(PTHREAD_CFLAGS) to allow debugging with gdb AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS) $(PTHREAD_CFLAGS) -INCLUDES = -I$(top_srcdir)/src +AM_CPPFLAGS = -I$(top_srcdir)/src LIBS = \ $(top_builddir)/src/libopensc/libopensc.la \ $(top_builddir)/src/common/libscdl.la \