This reduces the chances of misusing the interfaces.
---
usr/lib/pkcs11/aep_stdll/Makefile.am | 11 +----------
usr/lib/pkcs11/bcom_stdll/Makefile.am | 11 +----------
usr/lib/pkcs11/cca_stdll/Makefile.am | 12 +-----------
usr/lib/pkcs11/cr_stdll/Makefile.am | 11 +----------
usr/lib/pkcs11/ica_s390_stdll/Makefile.am | 12 +-----------
usr/lib/pkcs11/ica_stdll/Makefile.am | 11 +----------
usr/lib/pkcs11/leeds_stdll/Makefile.am | 11 +----------
usr/lib/pkcs11/soft_stdll/Makefile.am | 10 ----------
usr/lib/pkcs11/tpm_stdll/Makefile.am | 10 ----------
9 files changed, 7 insertions(+), 92 deletions(-)
diff --git a/usr/lib/pkcs11/aep_stdll/Makefile.am
b/usr/lib/pkcs11/aep_stdll/Makefile.am
index 10b7ecd..d6a0add 100644
--- a/usr/lib/pkcs11/aep_stdll/Makefile.am
+++ b/usr/lib/pkcs11/aep_stdll/Makefile.am
@@ -1,7 +1,7 @@
stdll_LTLIBRARIES = libpkcs11_aep.la
libpkcs11_aep_la_LDFLAGS = $(LCRYPTO) \
-$(AEP_LIB_DIRS) -nostartfiles -shared -Wl,-soname,PKCS11_AEP.so.1 -lc \
+$(AEP_LIB_DIRS) -nostartfiles -shared -lc \
-lpthread -lcrypto -laep
libpkcs11_aep_la_CFLAGS = -DSPINXPL -DDEV \
@@ -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 edabb9e..eab4c4c 100644
--- a/usr/lib/pkcs11/bcom_stdll/Makefile.am
+++ b/usr/lib/pkcs11/bcom_stdll/Makefile.am
@@ -1,7 +1,7 @@
stdll_LTLIBRARIES = libpkcs11_bc.la
libpkcs11_bc_la_LDFLAGS = $(LCRYPTO) $(BC_LIB_DIRS) \
--nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,PKCS11_BC.so.1 -lc \
+-nostartfiles -shared -Wl,-Bsymbolic -lc \
-lpthread -lubsec -ldl
VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
@@ -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 8f00184..dc3cc6f 100644
--- a/usr/lib/pkcs11/cca_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cca_stdll/Makefile.am
@@ -12,7 +12,7 @@ libpkcs11_cca_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \
-DSTDLL_NAME=\"ccatok\"
libpkcs11_cca_la_LDFLAGS = -shared -Wl,-Bsymbolic \
- -lcrypto -lpthread -nostartfiles -Wl,-soname,$@
+ -lcrypto -lpthread -nostartfiles
libpkcs11_cca_la_SOURCES = asn1.c \
../common/btree.c \
@@ -51,13 +51,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 60ad9ed..f326c74 100644
--- a/usr/lib/pkcs11/cr_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cr_stdll/Makefile.am
@@ -1,7 +1,7 @@
stdll_LTLIBRARIES = libpkcs11_cr.la
libpkcs11_cr_la_LDFLAGS = $(LCRYPTO) $(CR_LIB_DIRS) \
--nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,PKCS11_BC.so.1 -lc \
+-nostartfiles -shared -Wl,-Bsymbolic -lc \
-lpthread -lsocketarmor -ldl -lcrypto
VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
@@ -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 38eb6e1..dd7f9ee 100644
--- a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
+++ b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
@@ -1,7 +1,7 @@
stdll_LTLIBRARIES = libpkcs11_ica.la
libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \
-$(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,$@ \
+$(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic \
-Wl,-Bsymbolic -lc -lpthread -lica -ldl -lcrypto
libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
@@ -24,13 +24,3 @@ libpkcs11_ica_la_SOURCES = ../common/asn1.c
../common/btree.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 722470b..daae261 100644
--- a/usr/lib/pkcs11/ica_stdll/Makefile.am
+++ b/usr/lib/pkcs11/ica_stdll/Makefile.am
@@ -2,7 +2,7 @@ stdll_LTLIBRARIES = libpkcs11_ica.la
libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \
$(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic \
--Wl,-soname,PKCS11_ICA.so.1 -lc -lpthread -ldl -lica
+-lc -lpthread -ldl -lica
libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNOCDMF -DNOMD2 \
@@ -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..91a638a 100644
--- a/usr/lib/pkcs11/leeds_stdll/Makefile.am
+++ b/usr/lib/pkcs11/leeds_stdll/Makefile.am
@@ -1,7 +1,7 @@
stdll_LTLIBRARIES=libpkcs11_4758.la
libpkcs11_4758_la_LDFLAGS = $(SCC_LIBS) -nostartfiles -shared \
- -Wl,-Bsymbolic -Wl,-soname,[email protected] -lpthread -lscc -ldl
+ -Wl,-Bsymbolic -lpthread -lscc -ldl
libpkcs11_4758_la_CFLAGS = -DDEV -D_THREAD_SAFE -DLEEDS_BUILD
@@ -9,12 +9,3 @@ libpkcs11_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 87bbe00..c9b9587 100644
--- a/usr/lib/pkcs11/soft_stdll/Makefile.am
+++ b/usr/lib/pkcs11/soft_stdll/Makefile.am
@@ -47,13 +47,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 4d75cfe..2a9808c 100644
--- a/usr/lib/pkcs11/tpm_stdll/Makefile.am
+++ b/usr/lib/pkcs11/tpm_stdll/Makefile.am
@@ -49,13 +49,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.5.rc1
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
