By building targets directly on the top-level Makefile, it becomes
easy for GNU make to build objects in parallel, which is a key trick
to ensure a quick build on modern systems.
---
.gitignore | 9 +++++----
Makefile.am | 36 +++++++++++++++++++++++++++++++++---
configure.in | 4 +---
usr/sbin/pkcsconf/Makefile.am | 9 ---------
usr/sbin/pkcsslotd/Makefile.am | 9 ---------
5 files changed, 39 insertions(+), 28 deletions(-)
delete mode 100644 usr/sbin/pkcsconf/Makefile.am
delete mode 100644 usr/sbin/pkcsslotd/Makefile.am
diff --git a/.gitignore b/.gitignore
index ed42ae3..b5d21cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.o
*~
.deps
+.dirstamp
.libs
/aclocal.m4
/autom4te.cache/
@@ -15,16 +16,16 @@
/install-sh
/libtool
/ltmain.sh
+/man/opencryptoki.7
+/man/pk_config_data.5
/man/pkcs11_startup.1
/man/pkcsconf.1
-/man/pk_config_data.5
-/man/opencryptoki.7
/man/pkcsslotd.8
/misc/pkcsslotd
/missing
/usr/sbin/pkcs11_startup/pkcs11_startup
/usr/sbin/pkcs_slot/pkcs_slot
-/usr/sbin/pkcsconf/pkcsconf
-/usr/sbin/pkcsslotd/pkcsslotd
Makefile
Makefile.in
+pkcsconf
+pkcsslotd
diff --git a/Makefile.am b/Makefile.am
index f0b63a8..32f774f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,8 @@ dist_doc_DATA = AUTHORS ChangeLog LICENSE COPYRIGHTS FAQ README
TODO \
SUBDIRS =
+sbin_PROGRAMS =
+
if ENABLE_ICATOK
SUBDIRS += usr/lib/pkcs11/ica_s390_stdll
endif
@@ -46,10 +48,10 @@ endif
if ENABLE_DAEMON
SUBDIRS += \
misc \
- usr/sbin/pkcsslotd \
usr/sbin/pkcs11_startup \
- usr/sbin/pkcs_slot \
- usr/sbin/pkcsconf
+ usr/sbin/pkcs_slot
+
+sbin_PROGRAMS += pkcsslotd pkcsconf
if ENABLE_PKCSCCA_MIGRATE
SUBDIRS += usr/sbin/pkcscca_migrate
@@ -73,3 +75,31 @@ pkginclude_HEADERS = \
usr/include/pkcs11/pkcs11types.h \
usr/include/pkcs11/pkcs11.h
endif
+
+pkcsslotd_SOURCES = \
+ usr/sbin/pkcsslotd/slotmgr.c \
+ usr/sbin/pkcsslotd/shmem.c \
+ usr/sbin/pkcsslotd/signal.c \
+ usr/sbin/pkcsslotd/mutex.c \
+ usr/sbin/pkcsslotd/err.c \
+ usr/sbin/pkcsslotd/log.c \
+ usr/sbin/pkcsslotd/daemon.c \
+ usr/sbin/pkcsslotd/no_odm.c \
+ usr/sbin/pkcsslotd/garbage_linux.c
+
+pkcsslotd_CFLAGS = -DSPINXPL -DPROGRAM_NAME=\"$(@)\" -DNOODM -DNODAE \
+ -I$(top_srcdir)/usr/sbin \
+ -I$(top_srcdir)/usr/include/pkcs11 \
+ -I$(top_srcdir)/include/pkcs11/stdll
+
+pkcsslotd_LDADD = -lpthread
+
+pkcsconf_SOURCES = \
+ usr/lib/pkcs11/common/p11util.c \
+ usr/sbin/pkcsconf/pkcsconf.c
+
+pkcsconf_CFLAGS = -DSPINXPL -D_THREAD_SAFE -DDEBUG -DDEV -DAPI \
+ -I$(top_srcdir)/usr/include/pkcs11 \
+ -I$(top_srcdir)/usr/lib/pkcs11/common
+
+pkcsconf_LDADD = -ldl -lpthread
diff --git a/configure.in b/configure.in
index f4f7080..8a60d71 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([openCryptoki],[2.3.3],[[email protected]])
-AM_INIT_AUTOMAKE([foreign 1.11])
+AM_INIT_AUTOMAKE([foreign subdir-objects 1.11])
LT_INIT([disable-static])
@@ -617,10 +617,8 @@ AC_CONFIG_FILES([Makefile
usr/lib/pkcs11/api/Makefile \
usr/lib/pkcs11/ica_stdll/Makefile \
usr/lib/pkcs11/ica_s390_stdll/Makefile \
- usr/sbin/pkcsslotd/Makefile \
usr/sbin/pkcs11_startup/Makefile \
usr/sbin/pkcs_slot/Makefile \
- usr/sbin/pkcsconf/Makefile \
usr/sbin/pkcscca_migrate/Makefile \
usr/lib/pkcs11/methods/Makefile \
usr/lib/pkcs11/leeds_stdll/Makefile \
diff --git a/usr/sbin/pkcsconf/Makefile.am b/usr/sbin/pkcsconf/Makefile.am
deleted file mode 100644
index b18f5e6..0000000
--- a/usr/sbin/pkcsconf/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-sbin_PROGRAMS=pkcsconf
-
-pkcsconf_LDFLAGS = -lpthread -ldl
-
-pkcsconf_CFLAGS = -DSPINXPL -D_THREAD_SAFE -DDEBUG -DDEV -DAPI
-
-pkcsconf_SOURCES = ../../lib/pkcs11/common/p11util.c pkcsconf.c
-
-INCLUDES = -I../../include/pkcs11 -I. -I../../lib/pkcs11/common
diff --git a/usr/sbin/pkcsslotd/Makefile.am b/usr/sbin/pkcsslotd/Makefile.am
deleted file mode 100644
index 0266401..0000000
--- a/usr/sbin/pkcsslotd/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-sbin_PROGRAMS=pkcsslotd
-
-pkcsslotd_LDFLAGS = -lpthread
-
-pkcsslotd_CFLAGS = -DSPINXPL -DPROGRAM_NAME=\"$(@)\" -DNOODM -DNODAE \
- -I../. -I../../include/pkcs11 -I../../include/pkcs11/stdll
-
-pkcsslotd_SOURCES = slotmgr.c shmem.c signal.c mutex.c err.c log.c daemon.c \
- no_odm.c garbage_linux.c
\ No newline at end of file
--
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
