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

AC_SUBSTed variables are better used with $(..). Thanks to Ralf Wildenhues.

Browse Source 
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2557 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aj 2005-09-08 17:15:07 +00:00
parent 6c4e5c191d
commit ce14d27cb3
7 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libopensc/Makefile.am
View File

@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak libopensc.pc.in libpkcs15init.pc.in libscconf.pc.in
INCLUDES = @CPPFLAGS@ @OPENSSL_CFLAGS@ @OPENCT_CFLAGS@ @PCSC_CFLAGS@
INCLUDES = $(CPPFLAGS) $(OPENSSL_CFLAGS) $(OPENCT_CFLAGS) $(PCSC_CFLAGS)
AM_LDFLAGS =
bin_SCRIPTS = opensc-config
@ -33,7 +33,7 @@ libopensc_la_SOURCES = \
pkcs15-netkey.c pkcs15-esteid.c pkcs15-postecert.c pkcs15-gemsafe.c \
pkcs15-actalis.c pkcs15-atrust-acos.c
libopensc_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
libopensc_la_LIBADD = @LIBSCCONF@ @OPENSSL_LIBS@ @OPENCT_LIBS@ @PCSC_LIBS@ @LIBLTDL@
libopensc_la_LIBADD = @LIBSCCONF@ $(OPENSSL_LIBS) $(OPENCT_LIBS) $(PCSC_LIBS) $(LIBLTDL)
include_HEADERS = \
opensc.h pkcs15.h emv.h \
@ -42,5 +42,5 @@ include_HEADERS = \
noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h
pkgconfigdir = @libdir@/pkgconfig
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libopensc.pc libpkcs15init.pc libscconf.pc

9
src/pkcs11/Makefile.am
View File

@ -1,7 +1,6 @@
# Process this file with automake to create Makefile.in
bundledir = @BUNDLEDIR@/pkcs11
libdir = @libdir@
bundledir = $(BUNDLEDIR)/pkcs11
includedir = @includedir@/opensc
MAINTAINERCLEANFILES = Makefile.in
@ -10,7 +9,7 @@ EXTRA_DIST = Makefile.mak opensc_pkcs11_install.js
SUBDIRS = . rsaref
INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/pkcs15init @OPENSSL_CFLAGS@
INCLUDES = $(CPPFLAGS) -I${top_srcdir}/src/pkcs15init $(OPENSSL_CFLAGS)
SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \
mechanism.c openssl.c secretkey.c framework-pkcs15.c \
@ -22,7 +21,7 @@ noinst_LTLIBRARIES = libpkcs11.la
opensc_pkcs11_la_SOURCES = $(SRC) $(INC)
opensc_pkcs11_la_LDFLAGS = -module -avoid-version
opensc_pkcs11_la_LIBADD = @LIBOPENSC@ @OPENSSL_LIBS@ \
opensc_pkcs11_la_LIBADD = @LIBOPENSC@ $(OPENSSL_LIBS) \
../pkcs15init/libpkcs15init.la
libpkcs11_la_SOURCES = libpkcs11.c
@ -31,7 +30,7 @@ libpkcs11_la_LIBADD =
pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h
pkcs11_spy_la_LDFLAGS = -module -avoid-version
pkcs11_spy_la_LIBADD = @LIBSCCONF@ @OPENSSL_LIBS@ libpkcs11.la @LIBLTDL@
pkcs11_spy_la_LIBADD = @LIBSCCONF@ $(OPENSSL_LIBS) libpkcs11.la $(LIBLTDL)
include_HEADERS = pkcs11.h

4
src/pkcs15init/Makefile.am
View File

@ -4,8 +4,8 @@ includedir = @includedir@/opensc
MAINTAINERCLEANFILES = Makefile.in
AM_CFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" @OPENSSL_CFLAGS@
AM_LDFLAGS = @LIBOPENSC@ @OPENSSL_LIBS@
AM_CFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\" $(OPENSSL_CFLAGS)
AM_LDFLAGS = @LIBOPENSC@ $(OPENSSL_LIBS)
PROFILES = \
cyberflex.profile \

1
src/scconf/Makefile.am
View File

@ -16,5 +16,4 @@ libscconf_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@O
noinst_PROGRAMS = test-conf
test_conf_SOURCES = test-conf.c
test_conf_LDFLAGS = @LDFLAGS@
test_conf_LDADD = libscconf.la

6
src/signer/Makefile.am
View File

@ -1,6 +1,6 @@
# Process this file with automake to create Makefile.in
plugindir = @PLUGINDIR@
plugindir = $(PLUGINDIR)
libdir = @libdir@/opensc
MAINTAINERCLEANFILES = Makefile.in
@ -9,7 +9,7 @@ SUBDIRS = . npinclude
EXTRA_DIST = testprog.c
INCLUDES = @CPPFLAGS@ @OPENSSL_CFLAGS@ @ASSUAN_CFLAGS@ -I$(srcdir)/npinclude
INCLUDES = -I$(srcdir)/npinclude $(CPPFLAGS) $(OPENSSL_CFLAGS) $(ASSUAN_CFLAGS)
if HAVE_OPENSSL
if HAVE_ASSUAN
@ -18,7 +18,7 @@ endif
endif
opensc_signer_la_LDFLAGS = -module -avoid-version
opensc_signer_la_LIBADD = @LIBOPENSC@ @OPENSSL_LIBS@ @ASSUAN_LIBS@
opensc_signer_la_LIBADD = @LIBOPENSC@ $(OPENSSL_LIBS) $(ASSUAN_LIBS)
opensc_signer_la_CFLAGS = $(AM_CFLAGS) -DXP_UNIX
opensc_signer_la_SOURCES = \
opensc-crypto.c opensc-support.c signer.c stubs.c dialog.c

2
src/tests/Makefile.am
View File

@ -6,7 +6,7 @@ SUBDIRS = . regression
EXTRA_DIST = Makefile.mak
AM_LDFLAGS = @LIBOPENSC@ @LIBLTDL@
AM_LDFLAGS = @LIBOPENSC@ $(LIBLTDL)
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest

14
src/tools/Makefile.am
View File

@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Makefile.mak
AM_CFLAGS = @OPENSSL_CFLAGS@
AM_CFLAGS = $(OPENSSL_CFLAGS)
AM_LDFLAGS = @LIBOPENSC@
if HAVE_OPENSSL
@ -18,22 +18,22 @@ bin_PROGRAMS = opensc-tool opensc-explorer pkcs15-tool pkcs15-crypt \
opensc_tool_SOURCES = opensc-tool.c util.c
opensc_tool_LDADD = @GETOPTSRC@
opensc_explorer_SOURCES = opensc-explorer.c util.c
opensc_explorer_LDADD = @GETOPTSRC@ @LIBREADLINE@
opensc_explorer_LDADD = @GETOPTSRC@ $(LIBREADLINE)
pkcs15_tool_SOURCES = pkcs15-tool.c util.c
pkcs15_tool_LDADD = @GETOPTSRC@
pkcs11_tool_SOURCES = pkcs11-tool.c util.c
pkcs11_tool_LDADD = @GETOPTSRC@ ../pkcs11/libpkcs11.la @OPENSSL_LIBS@ @LIBLTDL@
pkcs11_tool_LDADD = @GETOPTSRC@ ../pkcs11/libpkcs11.la $(OPENSSL_LIBS) $(LIBLTDL)
pkcs15_crypt_SOURCES = pkcs15-crypt.c util.c
pkcs15_crypt_LDADD = @GETOPTSRC@ @OPENSSL_LIBS@
pkcs15_crypt_LDADD = @GETOPTSRC@ $(OPENSSL_LIBS)
cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c
cryptoflex_tool_LDADD = @GETOPTSRC@ @OPENSSL_LIBS@
cryptoflex_tool_LDADD = @GETOPTSRC@ $(OPENSSL_LIBS)
pkcs15_init_SOURCES = pkcs15-init.c util.c
pkcs15_init_LDADD = @GETOPTSRC@ @OPENSSL_LIBS@ ../pkcs15init/libpkcs15init.la
pkcs15_init_LDADD = @GETOPTSRC@ $(OPENSSL_LIBS) ../pkcs15init/libpkcs15init.la
cardos_info_SOURCES = cardos-info.c util.c
cardos_info_LDADD = @GETOPTSRC@
eidenv_SOURCES = eidenv.c
eidenv_LDADD = @GETOPTSRC@
netkey_tool_SOURCES = netkey-tool.c
netkey_tool_LDADD = @GETOPTSRC@ @OPENSSL_LIBS@
netkey_tool_LDADD = @GETOPTSRC@ $(OPENSSL_LIBS)
noinst_HEADERS = util.h