Main changes: - bring loader (ld.so.conf.d) configuration to usr/lib - build ica_s390_stdll on s390[x] archs, ica_stdll on any other arch - make building swtok on s390[x] possible
Signed-off-by: Klaus Heinrich Kiwi <[email protected]> --- usr/Makefile.am | 2 +- usr/lib/Makefile.am | 9 +++++++++ usr/lib/pkcs11/Makefile.am | 38 +++++++++++++++++++------------------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/usr/Makefile.am b/usr/Makefile.am index d24afb1..30b47c7 100644 --- a/usr/Makefile.am +++ b/usr/Makefile.am @@ -1,4 +1,4 @@ -if DAEMON +if ENABLE_DAEMON DAEMONDIRS = include sbin endif diff --git a/usr/lib/Makefile.am b/usr/lib/Makefile.am index 75e0268..5b0761f 100644 --- a/usr/lib/Makefile.am +++ b/usr/lib/Makefile.am @@ -1 +1,10 @@ SUBDIRS = pkcs11 + +install-data-hook: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/ld.so.conf.d + echo "$(DESTDIR)$(libdir)/opencryptoki" >\ + $(DESTDIR)$(sysconfdir)/ld.so.conf.d/opencryptoki-$(target_cpu).conf + echo "$(DESTDIR)$(libdir)/opencryptoki/stdll" >>\ + $(DESTDIR)$(sysconfdir)/ld.so.conf.d/opencryptoki-$(target_cpu).conf + echo "**** Remember you must run ldconfig before using the above settings ****" + diff --git a/usr/lib/pkcs11/Makefile.am b/usr/lib/pkcs11/Makefile.am index 9eb9d8b..a0bdd5c 100644 --- a/usr/lib/pkcs11/Makefile.am +++ b/usr/lib/pkcs11/Makefile.am @@ -1,42 +1,42 @@ +if ENABLE_ICATOK if S390 - -if DEFAULT_DLL -DEFAULT = ica_s390_stdll -endif - +ICA_DLL = ica_s390_stdll else - -if DEFAULT_DLL -DEFAULT = soft_stdll +ICA_DLL = ica_stdll endif - endif -if ICA -ICA_DLL = ica_stdll +if ENABLE_SWTOK +SW_DLL = soft_stdll endif -if TPM + +if ENABLE_TPMTOK TPM_DLL = tpm_stdll endif -if ICC + +if ENABLE_ICCTOK LEEDS_DLL= methods leeds_stdll endif -if AEP + +if ENABLE_AEPTOK AEP_DLL = aep_stdll endif -if BCOM + +if ENABLE_BCOMTOK BCOM_DLL = bcom_stdll endif -if CR + +if ENABLE_CRTOK CR_DLL = cr_stdll endif -if CCA + +if ENABLE_CCATOK CCA_DLL = cca_stdll endif -if LIBRARY +if ENABLE_LIBRARY API = api endif -SUBDIRS = $(API) $(DEFAULT) $(ICA_DLL) $(TPM_DLL) $(LEEDS_DLL) $(AEP_DLL) $(BCOM_DLL) $(CR_DLL) $(CCA_DLL) +SUBDIRS = $(API) $(SW_DLL) $(ICA_DLL) $(TPM_DLL) $(LEEDS_DLL) $(AEP_DLL) $(BCOM_DLL) $(CR_DLL) $(CCA_DLL) -- 1.6.2.5 ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf _______________________________________________ Opencryptoki-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
