Use SUBDIRS directly to queue up the subdirectories to build.
---
Makefile.am | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d2ce2a3..f0b63a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,69 +1,66 @@
dist_doc_DATA = AUTHORS ChangeLog LICENSE COPYRIGHTS FAQ README TODO \
doc/openCryptoki-HOWTO.pdf doc/README.token_data
-LIBDIRS =
+SUBDIRS =
if ENABLE_ICATOK
-LIBDIRS += usr/lib/pkcs11/ica_s390_stdll
+SUBDIRS += usr/lib/pkcs11/ica_s390_stdll
endif
if ENABLE_SWTOK
-LIBDIRS += usr/lib/pkcs11/soft_stdll
+SUBDIRS += usr/lib/pkcs11/soft_stdll
endif
if ENABLE_TPMTOK
-LIBDIRS += usr/lib/pkcs11/tpm_stdll
+SUBDIRS += usr/lib/pkcs11/tpm_stdll
dist_doc_DATA += doc/README.tpm_stdll
endif
if ENABLE_ICCTOK
-LIBDIRS += usr/lib/pkcs11/methods usr/lib/pkcs11/leeds_stdll
+SUBDIRS += usr/lib/pkcs11/methods usr/lib/pkcs11/leeds_stdll
endif
if ENABLE_AEPTOK
-LIBDIRS += usr/lib/pkcs11/aep_stdll
+SUBDIRS += usr/lib/pkcs11/aep_stdll
endif
if ENABLE_BCOMTOK
-LIBDIRS += usr/lib/pkcs11/bcom_stdll
+SUBDIRS += usr/lib/pkcs11/bcom_stdll
endif
if ENABLE_CRTOK
-LIBDIRS += usr/lib/pkcs11/cr_stdll
+SUBDIRS += usr/lib/pkcs11/cr_stdll
endif
if ENABLE_CCATOK
-LIBDIRS += usr/lib/pkcs11/cca_stdll
+SUBDIRS += usr/lib/pkcs11/cca_stdll
dist_doc_DATA += doc/README.cca_stdll
endif
if ENABLE_LIBRARY
-LIBDIRS += usr/lib/pkcs11/api
+SUBDIRS += usr/lib/pkcs11/api
endif
-if ENABLE_TESTCASES
-TESTDIR = testcases
-endif
-
if ENABLE_DAEMON
-MISCDIR = misc
-
-DAEMONDIRS = \
+SUBDIRS += \
+ misc \
usr/sbin/pkcsslotd \
usr/sbin/pkcs11_startup \
usr/sbin/pkcs_slot \
usr/sbin/pkcsconf
if ENABLE_PKCSCCA_MIGRATE
-DAEMONDIRS += usr/sbin/pkcscca_migrate
+SUBDIRS += usr/sbin/pkcscca_migrate
dist_doc_DATA += doc/README.pkcscca_migrate
endif
endif
-SUBDIRS = $(LIBDIRS) $(DAEMONDIRS) $(MISCDIR) $(TESTDIR)
+if ENABLE_TESTCASES
+SUBDIRS += testcases
+endif
man1_MANS = man/pkcsconf.1 man/pkcs11_startup.1
man5_MANS = man/pk_config_data.5
--
1.7.4.rc3
------------------------------------------------------------------------------
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
