With this method you cut sensibly the number of recursions make has to take
care of when building opencryptoki, making the build process much faster.
---
Makefile.am | 53 +++++++++++++++++++++++++++++++++++++++++++-
configure.in | 7 ++---
usr/Makefile.am | 5 ----
usr/lib/Makefile.am | 12 ----------
usr/lib/pkcs11/Makefile.am | 38 -------------------------------
usr/sbin/Makefile.am | 6 -----
6 files changed, 55 insertions(+), 66 deletions(-)
delete mode 100644 usr/Makefile.am
delete mode 100644 usr/lib/Makefile.am
delete mode 100644 usr/lib/pkcs11/Makefile.am
delete mode 100644 usr/sbin/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 14d379c..c243960 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,63 @@
+LIBDIRS =
+
+if ENABLE_ICATOK
+LIBDIRS += usr/lib/pkcs11/ica_s390_stdll
+endif
+
+if ENABLE_SWTOK
+LIBDIRS += usr/lib/pkcs11/soft_stdll
+endif
+
+if ENABLE_TPMTOK
+LIBDIRS += usr/lib/pkcs11/tpm_stdll
+endif
+
+if ENABLE_ICCTOK
+LIBDIRS += usr/lib/pkcs11/methods usr/lib/pkcs11/leeds_stdll
+endif
+
+if ENABLE_AEPTOK
+LIBDIRS += usr/lib/pkcs11/aep_stdll
+endif
+
+if ENABLE_BCOMTOK
+LIBDIRS += usr/lib/pkcs11/bcom_stdll
+endif
+
+if ENABLE_CRTOK
+LIBDIRS += usr/lib/pkcs11/cr_stdll
+endif
+
+if ENABLE_CCATOK
+LIBDIRS += usr/lib/pkcs11/cca_stdll
+endif
+
+if ENABLE_LIBRARY
+LIBDIRS += usr/lib/pkcs11/api
+endif
+
if ENABLE_TESTCASES
TESTDIR = testcases
endif
+
if ENABLE_LIBRARY
MISCDIR = misc
endif
+
if ENABLE_DAEMON
MISCDIR = misc
+
+DAEMONDIRS = \
+ usr/include \
+ usr/sbin/pkcsslotd \
+ usr/sbin/pkcs11_startup \
+ usr/sbin/pkcs_slot \
+ usr/sbin/pkcsconf
+
+if ENABLE_PKCSCCA_MIGRATE
+DAEMONDIRS += usr/sbin/pkcscca_migrate
endif
-SUBDIRS = usr man $(MISCDIR) $(TESTDIR)
+endif
+SUBDIRS = $(LIBDIRS) $(DAEMONDIRS) man $(MISCDIR) $(TESTDIR)
diff --git a/configure.in b/configure.in
index c93b75d..88bd938 100644
--- a/configure.in
+++ b/configure.in
@@ -610,19 +610,18 @@ CFLAGS="$CFLAGS -DPKCS64 -D_XOPEN_SOURCE=500"
CFLAGS+=' -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\"
-DSBIN_PATH=\"$(sbindir)\" -DLIB_PATH=\"$(libdir)\"'
+AC_SUBST([stdlldir], ['$(libdir)/opencryptoki/stdll'])
+
# At this point, CFLAGS is set to something sensible
AC_PROG_CC
-AC_CONFIG_FILES([Makefile usr/Makefile \
+AC_CONFIG_FILES([Makefile
usr/include/Makefile \
usr/include/pkcs11/Makefile \
- usr/lib/Makefile \
- usr/lib/pkcs11/Makefile \
usr/lib/pkcs11/api/Makefile \
usr/lib/pkcs11/api/shrd_mem.c \
usr/lib/pkcs11/ica_stdll/Makefile \
usr/lib/pkcs11/ica_s390_stdll/Makefile \
- usr/sbin/Makefile \
usr/sbin/pkcsslotd/Makefile \
usr/sbin/pkcs11_startup/Makefile \
usr/sbin/pkcs_slot/Makefile \
diff --git a/usr/Makefile.am b/usr/Makefile.am
deleted file mode 100644
index 30b47c7..0000000
--- a/usr/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-if ENABLE_DAEMON
-DAEMONDIRS = include sbin
-endif
-
-SUBDIRS = lib $(DAEMONDIRS)
diff --git a/usr/lib/Makefile.am b/usr/lib/Makefile.am
deleted file mode 100644
index a809b9c..0000000
--- a/usr/lib/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SUBDIRS = pkcs11
-
-install-data-hook:
- $(MKDIR_P) $(DESTDIR)/etc/ld.so.conf.d
- echo "$(libdir)/opencryptoki" >\
- $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(target_cpu).conf
- echo "$(libdir)/opencryptoki/stdll" >>\
- $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(target_cpu).conf
- echo "**** Remember you must run ldconfig before using the above
settings ****"
-
-uninstall-hook:
- rm -f $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(target_cpu).conf
diff --git a/usr/lib/pkcs11/Makefile.am b/usr/lib/pkcs11/Makefile.am
deleted file mode 100644
index b5fab5e..0000000
--- a/usr/lib/pkcs11/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-if ENABLE_ICATOK
-ICA_DLL = ica_s390_stdll
-endif
-
-if ENABLE_SWTOK
-SW_DLL = soft_stdll
-endif
-
-if ENABLE_TPMTOK
-TPM_DLL = tpm_stdll
-endif
-
-if ENABLE_ICCTOK
-LEEDS_DLL= methods leeds_stdll
-endif
-
-if ENABLE_AEPTOK
-AEP_DLL = aep_stdll
-endif
-
-if ENABLE_BCOMTOK
-BCOM_DLL = bcom_stdll
-endif
-
-if ENABLE_CRTOK
-CR_DLL = cr_stdll
-endif
-
-if ENABLE_CCATOK
-CCA_DLL = cca_stdll
-endif
-
-if ENABLE_LIBRARY
-API = api
-endif
-
-SUBDIRS = $(API) $(SW_DLL) $(ICA_DLL) $(TPM_DLL) $(LEEDS_DLL) $(AEP_DLL)
$(BCOM_DLL) $(CR_DLL) $(CCA_DLL)
-
diff --git a/usr/sbin/Makefile.am b/usr/sbin/Makefile.am
deleted file mode 100644
index 708c973..0000000
--- a/usr/sbin/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-if ENABLE_PKCSCCA_MIGRATE
-PKCSCCA_MIGRATE_DIR = pkcscca_migrate
-endif
-
-SUBDIRS = pkcsslotd pkcs11_startup pkcs_slot pkcsconf $(PKCSCCA_MIGRATE_DIR)
--
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
