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')
This commit is contained in:
parent
3656b478f0
commit
ea40e7fe24
@ -9,7 +9,7 @@ dist_noinst_DATA = \
|
|||||||
compat_getopt_main.c \
|
compat_getopt_main.c \
|
||||||
README.compat_strlcpy compat_strlcpy.3
|
README.compat_strlcpy compat_strlcpy.3
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/src
|
AM_CPPFLAGS = -I$(top_srcdir)/src
|
||||||
|
|
||||||
libcompat_la_SOURCES = \
|
libcompat_la_SOURCES = \
|
||||||
compat_dummy.c \
|
compat_dummy.c \
|
||||||
|
@ -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 \
|
authentic.h iasecc.h iasecc-sdo.h sm.h card-sc-hsm.h \
|
||||||
pace.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) \
|
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \
|
||||||
$(OPTIONAL_PCSC_CFLAGS) $(OPTIONAL_ZLIB_CFLAGS)
|
$(OPTIONAL_PCSC_CFLAGS) $(OPTIONAL_ZLIB_CFLAGS)
|
||||||
INCLUDES = -I$(top_srcdir)/src
|
|
||||||
|
|
||||||
libopensc_la_SOURCES = \
|
libopensc_la_SOURCES = \
|
||||||
sc.c ctx.c log.c errors.c \
|
sc.c ctx.c log.c errors.c \
|
||||||
|
@ -12,7 +12,7 @@ else
|
|||||||
dist_noinst_DATA = opensc-minidriver.inf minidriver-westcos.reg minidriver-sc-hsm.reg
|
dist_noinst_DATA = opensc-minidriver.inf minidriver-westcos.reg minidriver-sc-hsm.reg
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/src
|
AM_CPPFLAGS = -I$(top_srcdir)/src
|
||||||
|
|
||||||
opensc_minidriver@LIBRARY_BITNESS@_la_SOURCES = minidriver.c minidriver.exports \
|
opensc_minidriver@LIBRARY_BITNESS@_la_SOURCES = minidriver.c minidriver.exports \
|
||||||
$(top_builddir)/win32/versioninfo.rc
|
$(top_builddir)/win32/versioninfo.rc
|
||||||
|
@ -7,7 +7,7 @@ dist_noinst_SCRIPTS = opensc_pkcs11_install.js
|
|||||||
lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la
|
lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la
|
||||||
|
|
||||||
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
|
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_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 \
|
OPENSC_PKCS11_SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \
|
||||||
|
@ -31,9 +31,9 @@ dist_pkgdata_DATA = \
|
|||||||
iasecc_generic_pki.profile iasecc_admin_eid.profile iasecc_generic_oberthur.profile \
|
iasecc_generic_pki.profile iasecc_admin_eid.profile iasecc_generic_oberthur.profile \
|
||||||
openpgp.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)
|
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS)
|
||||||
INCLUDES = -I$(top_srcdir)/src
|
|
||||||
|
|
||||||
libpkcs15init_la_SOURCES = \
|
libpkcs15init_la_SOURCES = \
|
||||||
pkcs15-lib.c profile.c \
|
pkcs15-lib.c profile.c \
|
||||||
|
@ -9,7 +9,7 @@ noinst_HEADERS = internal.h scconf.h
|
|||||||
noinst_PROGRAMS = test-conf
|
noinst_PROGRAMS = test-conf
|
||||||
noinst_LTLIBRARIES = libscconf.la
|
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
|
libscconf_la_SOURCES = scconf.c parse.c write.c sclex.c
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||||||
EXTRA_DIST = Makefile.mak
|
EXTRA_DIST = Makefile.mak
|
||||||
|
|
||||||
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
|
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
|
LIBS = $(top_builddir)/src/libopensc/libopensc.la $(top_builddir)/src/common/libcompat.la
|
||||||
|
|
||||||
lib_LTLIBRARIES = libsmm-local.la
|
lib_LTLIBRARIES = libsmm-local.la
|
||||||
|
@ -6,7 +6,7 @@ EXTRA_DIST = Makefile.mak
|
|||||||
SUBDIRS = regression
|
SUBDIRS = regression
|
||||||
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
|
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/src
|
AM_CPPFLAGS = -I$(top_srcdir)/src
|
||||||
LIBS = \
|
LIBS = \
|
||||||
$(top_builddir)/src/libopensc/libopensc.la \
|
$(top_builddir)/src/libopensc/libopensc.la \
|
||||||
$(top_builddir)/src/common/libscdl.la \
|
$(top_builddir)/src/common/libscdl.la \
|
||||||
|
@ -12,7 +12,7 @@ endif
|
|||||||
|
|
||||||
# compile with $(PTHREAD_CFLAGS) to allow debugging with gdb
|
# compile with $(PTHREAD_CFLAGS) to allow debugging with gdb
|
||||||
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS) $(PTHREAD_CFLAGS)
|
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS) $(PTHREAD_CFLAGS)
|
||||||
INCLUDES = -I$(top_srcdir)/src
|
AM_CPPFLAGS = -I$(top_srcdir)/src
|
||||||
LIBS = \
|
LIBS = \
|
||||||
$(top_builddir)/src/libopensc/libopensc.la \
|
$(top_builddir)/src/libopensc/libopensc.la \
|
||||||
$(top_builddir)/src/common/libscdl.la \
|
$(top_builddir)/src/common/libscdl.la \
|
||||||
|
Loading…
Reference in New Issue
Block a user