This allows building them with their final PKCS11_$type name rather than
having to symlink them at install time.
---
usr/lib/pkcs11/aep_stdll/Makefile.am | 19 +++++--------------
usr/lib/pkcs11/bcom_stdll/Makefile.am | 19 +++++--------------
usr/lib/pkcs11/cca_stdll/Makefile.am | 18 ++++--------------
usr/lib/pkcs11/cr_stdll/Makefile.am | 19 +++++--------------
usr/lib/pkcs11/ica_s390_stdll/Makefile.am | 20 +++++---------------
usr/lib/pkcs11/ica_stdll/Makefile.am | 19 +++++--------------
usr/lib/pkcs11/leeds_stdll/Makefile.am | 17 ++++-------------
usr/lib/pkcs11/soft_stdll/Makefile.am | 18 ++++--------------
usr/lib/pkcs11/tpm_stdll/Makefile.am | 18 ++++--------------
9 files changed, 41 insertions(+), 126 deletions(-)
diff --git a/usr/lib/pkcs11/aep_stdll/Makefile.am
b/usr/lib/pkcs11/aep_stdll/Makefile.am
index 8c5e2be..10fc465 100644
--- a/usr/lib/pkcs11/aep_stdll/Makefile.am
+++ b/usr/lib/pkcs11/aep_stdll/Makefile.am
@@ -1,14 +1,14 @@
-stdll_LTLIBRARIES = libpkcs11_aep.la
+stdll_LTLIBRARIES = PKCS11_AEP.la
-libpkcs11_aep_la_LDFLAGS = $(LCRYPTO) \
-$(AEP_LIB_DIRS) -nostartfiles -shared -Wl,-soname,PKCS11_AEP.so.1 -lc \
+PKCS11_AEP_la_LDFLAGS = $(LCRYPTO) \
+$(AEP_LIB_DIRS) -nostartfiles -shared -module -avoid-version
-Wl,-soname,PKCS11_AEP.so.1 -lc \
-lpthread -lcrypto -laep
-libpkcs11_aep_la_CFLAGS = -DSPINXPL -DDEV \
+PKCS11_AEP_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -DNOCDMF -DNOMD2 \
-DNODSA -DAEP_GENERIC -DNORIPE -DSTDLL_NAME=\"aeptok\"
-libpkcs11_aep_la_SOURCES = ../common/asn1.c \
+PKCS11_AEP_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c
\
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
@@ -23,12 +23,3 @@ aeptok_specific.c aeptok_api.c
INCLUDES = -I/usr/include -I. -I../../../include/pkcs11/stdll \
-I../../../include/pkcs11 -I ../common
-
-install-data-hook:
- cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_aep.so PKCS11_AEP.so
-
-uninstall-hook:
- if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
- cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
- rm -f PKCS11_AEP.so; fi
diff --git a/usr/lib/pkcs11/bcom_stdll/Makefile.am
b/usr/lib/pkcs11/bcom_stdll/Makefile.am
index a10532a..8c563f5 100644
--- a/usr/lib/pkcs11/bcom_stdll/Makefile.am
+++ b/usr/lib/pkcs11/bcom_stdll/Makefile.am
@@ -1,16 +1,16 @@
-stdll_LTLIBRARIES = libpkcs11_bc.la
+stdll_LTLIBRARIES = PKCS11_BC.la
-libpkcs11_bc_la_LDFLAGS = $(LCRYPTO) $(BC_LIB_DIRS) \
--nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,PKCS11_BC.so.1 -lc \
+PKCS11_BC_la_LDFLAGS = $(LCRYPTO) $(BC_LIB_DIRS) \
+-nostartfiles -module -avoid-version -shared -Wl,-Bsymbolic
-Wl,-soname,PKCS11_BC.so.1 -lc \
-lpthread -lubsec -ldl
VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
-libpkcs11_bc_la_CFLAGS = -DSPINXPL -DDEV \
+PKCS11_BC_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA -DNOAES \
-DNODH -DNORIPE -DSTDLL_NAME=\"bcomtok\"
-libpkcs11_bc_la_SOURCES = ../common/asn1.c \
+PKCS11_BC_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
@@ -27,12 +27,3 @@ INCLUDES = $(BC_INC_DIRS) -I/usr/include
\
-I. -I../../../include/pkcs11/stdll -I../../../include/pkcs11 \
-I../common -I../../../ica/inc -I../../../../ica/include \
-I.. -I../../../../ica/src/inc
-
-install-data-hook:
- cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_bc.so PKCS11_BC.so
-
-uninstall-hook:
- if test -d $(DESTDIR)/$(libdir)/opencryptoki/stdll; then
- cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
- rm -f PKCS11_BC.so; fi
diff --git a/usr/lib/pkcs11/cca_stdll/Makefile.am
b/usr/lib/pkcs11/cca_stdll/Makefile.am
index 928b111..bfdf2cc 100644
--- a/usr/lib/pkcs11/cca_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cca_stdll/Makefile.am
@@ -4,17 +4,17 @@
#
# The PKCS#11 STDLL library
#
-stdll_LTLIBRARIES=libpkcs11_cca.la
+stdll_LTLIBRARIES=PKCS11_CCA.la
-libpkcs11_cca_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \
+PKCS11_CCA_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \
-DNODSA -DNODH -DNOECB \
-I. -I../../../include -I../../../include/pkcs11 -I../common \
-DSTDLL_NAME=\"ccatok\"
-libpkcs11_cca_la_LDFLAGS = -shared -Wl,-Bsymbolic \
+PKCS11_CCA_la_LDFLAGS = -shared -module -avoid-version -Wl,-Bsymbolic \
-lcrypto -lpthread -nostartfiles -Wl,-soname,$@
-libpkcs11_cca_la_SOURCES = asn1.c \
+PKCS11_CCA_la_SOURCES = asn1.c \
../common/dig_mgr.c \
../common/hwf_obj.c \
../common/log.c \
@@ -50,13 +50,3 @@ libpkcs11_cca_la_SOURCES = asn1.c \
noinst_HEADERS = h_extern.h tok_spec_struct.h defs.h csulincl.h
\
host_defs.h cca_stdll.h tok_specific.h
-
-install-data-hook:
- cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_cca.so PKCS11_CCA.so
- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok
-
-uninstall-hook:
- if test -d $(DESTDIR)/$(libdir)/opencryptoki/stdll; then \
- cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
- rm -f PKCS11_CCA.so; fi
diff --git a/usr/lib/pkcs11/cr_stdll/Makefile.am
b/usr/lib/pkcs11/cr_stdll/Makefile.am
index 2463058..e1eb284 100644
--- a/usr/lib/pkcs11/cr_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cr_stdll/Makefile.am
@@ -1,15 +1,15 @@
-stdll_LTLIBRARIES = libpkcs11_cr.la
+stdll_LTLIBRARIES = PKCS11_CR.la
-libpkcs11_cr_la_LDFLAGS = $(LCRYPTO) $(CR_LIB_DIRS) \
--nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,PKCS11_BC.so.1 -lc \
+PKCS11_CR_la_LDFLAGS = $(LCRYPTO) $(CR_LIB_DIRS) \
+-nostartfiles -shared -module -avoid-version -Wl,-Bsymbolic
-Wl,-soname,PKCS11_BC.so.1 -lc \
-lpthread -lsocketarmor -ldl -lcrypto
VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
-libpkcs11_cr_la_CFLAGS = -DSPINXPL -DDEV \
+PKCS11_CR_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA
-libpkcs11_cr_la_SOURCES = ../common/asn1.c \
+PKCS11_CR_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
@@ -26,12 +26,3 @@ INCLUDES = $(CR_INC_DIRS) -I/usr/include
\
-I. -I../../../include/pkcs11/stdll -I../../../include/pkcs11 \
-I../common -I../../../ica/inc -I../../../../ica/include \
-I.. -I../../../../ica/src/inc
-
-install-data-hook:
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_cr.so PKCS11_CR.so
-
-uninstall-hook:
- if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- rm -f PKCS11_CR.so; fi
diff --git a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
index 15b256e..1d41780 100644
--- a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
+++ b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
@@ -1,14 +1,14 @@
-stdll_LTLIBRARIES = libpkcs11_ica.la
+stdll_LTLIBRARIES = PKCS11_ICA.la
-libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \
-$(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,$@ \
+PKCS11_ICA_la_LDFLAGS = $(LCRYPTO) \
+$(ICA_LIB_DIRS) -nostartfiles -shared -module -avoid-version -Wl,-Bsymbolic
-Wl,-soname,$@ \
-Wl,-Bsymbolic -lc -lpthread -lica -ldl -lcrypto
-libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
+PKCS11_ICA_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNODH \
-DNOCDMF -DNOMD2 -DNODSA -DSTDLL_NAME=\"icatok\"
-libpkcs11_ica_la_SOURCES = ../common/asn1.c \
+PKCS11_ICA_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
@@ -24,13 +24,3 @@ libpkcs11_ica_la_SOURCES = ../common/asn1.c \
INCLUDES = $(ICA_INC_DIRS) -I. -I../../../include/pkcs11/stdll \
-I../../../include/pkcs11 -I../common -I../../../ica/inc \
-I../../../../ica/include -I.. -I../../../../ica/src/inc
-
-install-data-hook:
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_ica.so PKCS11_ICA.so
- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite
-
-uninstall-hook:
- if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- rm -f PKCS11_ICA.so; fi
diff --git a/usr/lib/pkcs11/ica_stdll/Makefile.am
b/usr/lib/pkcs11/ica_stdll/Makefile.am
index 727deef..2c3e35e 100644
--- a/usr/lib/pkcs11/ica_stdll/Makefile.am
+++ b/usr/lib/pkcs11/ica_stdll/Makefile.am
@@ -1,17 +1,17 @@
-stdll_LTLIBRARIES = libpkcs11_ica.la
+stdll_LTLIBRARIES = PKCS11_ICA.la
-libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \
-$(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic \
+PKCS11_ICA_la_LDFLAGS = $(LCRYPTO) \
+$(ICA_LIB_DIRS) -nostartfiles -shared -module -avoid-version -Wl,-Bsymbolic
\
-Wl,-soname,PKCS11_ICA.so.1 -lc -lpthread -ldl -lica
-libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
+PKCS11_ICA_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNOCDMF -DNOMD2 \
-DNODSA -DNOAES -DNODH -DNORIPE -DSTDLL_NAME=\"icatok\"
AM_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 \
-DLITE=1 -DNOCDMF -DNOMD2 -DNODSA -DNOAES -DNODH -DNORIPE
-libpkcs11_ica_la_SOURCES= ../common/asn1.c \
+PKCS11_ICA_la_SOURCES= ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
@@ -27,12 +27,3 @@ INCLUDES = $(ICA_INC_DIRS) -I/usr/include
\
-I. -I../../../include/pkcs11/stdll -I../../../include/pkcs11 \
-I../common -I../../../ica/inc -I../../../../ica/include \
-I.. -I../../../../ica/src/inc
-
-install-data-hook:
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_ica.so PKCS11_ICA.so
-
-uninstall-hook:
- if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- rm -f PKCS11_ICA.so; fi
diff --git a/usr/lib/pkcs11/leeds_stdll/Makefile.am
b/usr/lib/pkcs11/leeds_stdll/Makefile.am
index 6450112..7f2defd 100644
--- a/usr/lib/pkcs11/leeds_stdll/Makefile.am
+++ b/usr/lib/pkcs11/leeds_stdll/Makefile.am
@@ -1,20 +1,11 @@
-stdll_LTLIBRARIES=libpkcs11_4758.la
+stdll_LTLIBRARIES=PKCS11_4758.la
-libpkcs11_4758_la_LDFLAGS = $(SCC_LIBS) -nostartfiles -shared \
+PKCS11_4758_la_LDFLAGS = $(SCC_LIBS) -nostartfiles -shared -module
-avoid-version \
-Wl,-Bsymbolic -Wl,-soname,[email protected] -lpthread -lscc -ldl
-libpkcs11_4758_la_CFLAGS = -DDEV -D_THREAD_SAFE -DLEEDS_BUILD
+PKCS11_4758_la_CFLAGS = -DDEV -D_THREAD_SAFE -DLEEDS_BUILD
-libpkcs11_4758_la_SOURCES = host_api.c util.c
+PKCS11_4758_la_SOURCES = host_api.c util.c
INCLUDES = $(SCC_INC_DIRS) -I/usr/include -I. -I../../../include/pkcs11/stdll \
-I../../../include/pkcs11
-
-install-data-hook:
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_4758.so PKCS11_4758.so
-
-uninstall-hook:
- if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- rm -f PKCS11_4758.so; fi
diff --git a/usr/lib/pkcs11/soft_stdll/Makefile.am
b/usr/lib/pkcs11/soft_stdll/Makefile.am
index 6612bf1..532965a 100644
--- a/usr/lib/pkcs11/soft_stdll/Makefile.am
+++ b/usr/lib/pkcs11/soft_stdll/Makefile.am
@@ -1,9 +1,9 @@
-stdll_LTLIBRARIES = libpkcs11_sw.la
+stdll_LTLIBRARIES = PKCS11_SW.la
-libpkcs11_sw_la_LDFLAGS = -shared -Wl,-Bsymbolic \
+PKCS11_SW_la_LDFLAGS = -shared -module -avoid-version -Wl,-Bsymbolic \
-lc -lpthread -lcrypto
-libpkcs11_sw_la_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE \
+PKCS11_SW_la_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE \
-DSHALLOW=0 -DSWTOK=1 -DLITE=0 \
-DNOCDMF -DNOMD2 -DNODSA -DNORIPE
\
-fPIC \
@@ -12,7 +12,7 @@ libpkcs11_sw_la_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE \
-I../../../include/pkcs11 \
-I../common -DSTDLL_NAME=\"swtok\"
-libpkcs11_sw_la_SOURCES = ../common/asn1.c \
+PKCS11_SW_la_SOURCES = ../common/asn1.c \
../common/cert.c \
../common/hwf_obj.c \
../common/dp_obj.c \
@@ -46,13 +46,3 @@ libpkcs11_sw_la_SOURCES = ../common/asn1.c \
../common/log.c \
../common/mech_list.c \
soft_specific.c
-
-install-data-hook:
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_sw.so PKCS11_SW.so
- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok
-
-uninstall-hook:
- if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- rm -f PKCS11_SW.so; fi
diff --git a/usr/lib/pkcs11/tpm_stdll/Makefile.am
b/usr/lib/pkcs11/tpm_stdll/Makefile.am
index 74cbfbb..c44927f 100644
--- a/usr/lib/pkcs11/tpm_stdll/Makefile.am
+++ b/usr/lib/pkcs11/tpm_stdll/Makefile.am
@@ -1,20 +1,20 @@
# Makefile.am for common functions for openCryptoki
# Michael A. Halcrow <[email protected]>
-stdll_LTLIBRARIES=libpkcs11_tpm.la
+stdll_LTLIBRARIES=PKCS11_TPM.la
# TODO: -DLINUX and -DSPINXPL should be controlled via configure.in
-libpkcs11_tpm_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \
+PKCS11_TPM_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \
-DNODSA -DNODH \
-I. -I../../../include \
-I../../../include/pkcs11 \
-I../common -DMMAP \
-DSTDLL_NAME=\"tpmtok\"
-libpkcs11_tpm_la_LDFLAGS = -shared -Wl,-Bsymbolic \
+PKCS11_TPM_la_LDFLAGS = -shared -module -avoid-version -Wl,-Bsymbolic \
-lcrypto -ltspi -lpthread
-libpkcs11_tpm_la_SOURCES = ../common/asn1.c \
+PKCS11_TPM_la_SOURCES = ../common/asn1.c \
dig_mgr.c \
../common/hwf_obj.c \
../common/log.c \
@@ -48,13 +48,3 @@ libpkcs11_tpm_la_SOURCES = ../common/asn1.c \
noinst_HEADERS = h_extern.h tok_spec_struct.h defs.h \
host_defs.h tpm_specific.h tok_specific.h
-
-install-data-hook:
- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- ln -sf libpkcs11_tpm.so PKCS11_TPM.so
-
-uninstall-hook:
- if test -d $(DESTDIR)$(libdir)/opencryptoki/stdll; then \
- cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
- rm -rf PKCS11_TPM.so; fi
--
1.7.4.rc2
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
