giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove CFLAGS_OPENSC, cleanups to INCLUDES handling.

Browse Source 
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1316 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aet 2003-07-30 09:50:18 +00:00
parent ccc9aca6d2
commit a9f05d1100
12 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -1165,8 +1165,6 @@ AC_DEFINE_UNQUOTED(OPENSC_ETC_PATH, "$opensc_etc_path", [etc path for libopensc]
opensc_conf_path=`eval echo ${opensc_etc_path}/opensc.conf`
AC_DEFINE_UNQUOTED(OPENSC_CONF_PATH, "$opensc_conf_path", [default config file for libopensc])
AC_SUBST(CFLAGS_OPENSC)
CFLAGS_OPENSC=""
AC_SUBST(LIBOPENSC)
LIBOPENSC="\${top_builddir}/src/libopensc/libopensc.la"

2
src/libopensc/Makefile.am
View File

@ -25,7 +25,7 @@ if HAVE_OPENCT
OPENCT_SRC = reader-openct.c
endif
INCLUDES = $(PCSC_FLAGS) @OPENCT_CFLAGS@
INCLUDES = @CPPFLAGS@ $(PCSC_FLAGS) @OPENCT_CFLAGS@
LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
bin_SCRIPTS = opensc-config

2
src/openscd/Makefile.am
View File

@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = test.c
INCLUDES = @CFLAGS_OPENSC@ @CFLAGS_ASSUAN@
INCLUDES = @CPPFLAGS@ @CFLAGS_ASSUAN@
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
if HAVE_ASSUAN

2
src/pam/Makefile.am
View File

@ -4,7 +4,7 @@ libdir = @libdir@/security
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I${top_srcdir}/src/scam
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ ${top_builddir}/src/scam/libscam.la

2
src/pkcs11/Makefile.am
View File

@ -8,7 +8,7 @@ EXTRA_DIST = Makefile.mak opensc_pkcs11_install.js
SUBDIRS = . rsaref
INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/pkcs15init
SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \
mechanism.c openssl.c secretkey.c framework-pkcs15.c \

2
src/pkcs15init/Makefile.am
View File

@ -4,7 +4,7 @@ includedir = ${prefix}/include/opensc
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
CFLAGS = @CFLAGS@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
PROFILES = \

2
src/scam/Makefile.am
View File

@ -2,8 +2,6 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @CFLAGS_OPENSC@
lib_LTLIBRARIES = libscam.la
if HAVE_LDAP

2
src/sia/Makefile.am
View File

@ -4,7 +4,7 @@ libdir = @libdir@/security
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I${top_srcdir}/src/scam
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
LDFLAGS = @LDFLAGS@ @LIBDL@ ${top_builddir}/src/scam/libscam.la

2
src/signer/Makefile.am
View File

@ -9,7 +9,7 @@ SUBDIRS = . npinclude
EXTRA_DIST = testprog.c
INCLUDES = @CFLAGS_OPENSC@ @CFLAGS_ASSUAN@
INCLUDES = @CPPFLAGS@ @CFLAGS_ASSUAN@
if HAVE_SSL
if HAVE_ASSUAN

4
src/sslengines/Makefile.am
View File

@ -17,7 +17,7 @@ OPENSSL_CFLAGS = \
-DSHA1_ASM -DMD5_ASM -DRMD160_ASM
engine_opensc_la_SOURCES = hw_opensc.c engine_opensc.c engine_opensc.h
engine_opensc_la_CFLAGS = $(OPENSSL_CFLAGS) @CFLAGS_OPENSC@
engine_opensc_la_CFLAGS = $(OPENSSL_CFLAGS)
engine_opensc_la_LIBADD = @LIBCRYPTOA@ @LIBOPENSC@
engine_opensc_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version
@ -26,6 +26,6 @@ engine_pkcs11_la_SOURCES = \
p11_attr.c p11_cert.c p11_err.c p11_key.c \
p11_load.c p11_misc.c p11_rsa.c p11_slot.c \
pkcs11-internal.h libpkcs11.h
engine_pkcs11_la_CFLAGS = $(OPENSSL_CFLAGS) @CFLAGS_OPENSC@
engine_pkcs11_la_CFLAGS = $(OPENSSL_CFLAGS)
engine_pkcs11_la_LIBADD = @LIBCRYPTOA@ ../pkcs11/libpkcs11.la
engine_pkcs11_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version

1
src/tests/Makefile.am
View File

@ -6,7 +6,6 @@ SUBDIRS = . regression
EXTRA_DIST = Makefile.mak
INCLUDES = @CFLAGS_OPENSC@
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest

1
src/tools/Makefile.am
View File

@ -4,7 +4,6 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak
INCLUDES = @CFLAGS_OPENSC@
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
if HAVE_SSL