libtool takes care of dealing with PIC/non-PIC objects.
Also drop AM_CFLAGS where it's unused (target_CFLAGS overrides it).
---
usr/lib/pkcs11/aep_stdll/Makefile.am | 2 +-
usr/lib/pkcs11/bcom_stdll/Makefile.am | 2 +-
usr/lib/pkcs11/cr_stdll/Makefile.am | 2 +-
usr/lib/pkcs11/ica_s390_stdll/Makefile.am | 2 +-
usr/lib/pkcs11/ica_stdll/Makefile.am | 5 +----
usr/lib/pkcs11/soft_stdll/Makefile.am | 1 -
usr/sbin/pkcscca_migrate/Makefile.am | 2 --
usr/sbin/pkcsconf/Makefile.am | 2 --
usr/sbin/pkcsslotd/Makefile.am | 3 ---
9 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/usr/lib/pkcs11/aep_stdll/Makefile.am
b/usr/lib/pkcs11/aep_stdll/Makefile.am
index 32e916a..da2560f 100644
--- a/usr/lib/pkcs11/aep_stdll/Makefile.am
+++ b/usr/lib/pkcs11/aep_stdll/Makefile.am
@@ -6,7 +6,7 @@ libpkcs11_aep_la_LDFLAGS = $(TOKEN_LDFLAGS)
libpkcs11_aep_la_LIBADD = -lpthread -lcrypto -laep
libpkcs11_aep_la_CFLAGS = -DSPINXPL -DDEV \
--D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -DNOCDMF -DNOMD2 \
+-D_THREAD_SAFE -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -DNOCDMF -DNOMD2 \
-DNODSA -DAEP_GENERIC -DNORIPE -DSTDLL_NAME=\"aeptok\"
libpkcs11_aep_la_SOURCES = ../common/asn1.c \
diff --git a/usr/lib/pkcs11/bcom_stdll/Makefile.am
b/usr/lib/pkcs11/bcom_stdll/Makefile.am
index 5480bfc..10baf70 100644
--- a/usr/lib/pkcs11/bcom_stdll/Makefile.am
+++ b/usr/lib/pkcs11/bcom_stdll/Makefile.am
@@ -8,7 +8,7 @@ libpkcs11_bc_la_LIBADD = -lpthread -lubsec -ldl
VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
libpkcs11_bc_la_CFLAGS = -DSPINXPL -DDEV \
--D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA -DNOAES \
+-D_THREAD_SAFE $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA -DNOAES \
-DNODH -DNORIPE -DSTDLL_NAME=\"bcomtok\"
libpkcs11_bc_la_SOURCES = ../common/asn1.c \
diff --git a/usr/lib/pkcs11/cr_stdll/Makefile.am
b/usr/lib/pkcs11/cr_stdll/Makefile.am
index 721ce4f..e7bf095 100644
--- a/usr/lib/pkcs11/cr_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cr_stdll/Makefile.am
@@ -8,7 +8,7 @@ libpkcs11_cr_la_LIBADD = -lpthread -lsocketarmor -ldl -lcrypto
VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
libpkcs11_cr_la_CFLAGS = -DSPINXPL -DDEV \
--D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA
+-D_THREAD_SAFE $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA
libpkcs11_cr_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
diff --git a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
index 41a16a5..aca2aec 100644
--- a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
+++ b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
@@ -6,7 +6,7 @@ libpkcs11_ica_la_LDFLAGS = $(TOKEN_LDFLAGS)
libpkcs11_ica_la_LIBADD = -lpthread -lica -ldl -lcrypto
libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
--D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNODH \
+-D_THREAD_SAFE -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNODH \
-DNOCDMF -DNOMD2 -DNODSA -DSTDLL_NAME=\"icatok\"
libpkcs11_ica_la_SOURCES = ../common/asn1.c \
diff --git a/usr/lib/pkcs11/ica_stdll/Makefile.am
b/usr/lib/pkcs11/ica_stdll/Makefile.am
index 8bb77d0..73fa529 100644
--- a/usr/lib/pkcs11/ica_stdll/Makefile.am
+++ b/usr/lib/pkcs11/ica_stdll/Makefile.am
@@ -6,12 +6,9 @@ libpkcs11_ica_la_LDFLAGS = $(TOKEN_LDFLAGS)
libpkcs11_ica_la_LIBADD = -lpthread -ldl -lica
libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
--D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNOCDMF -DNOMD2 \
+-D_THREAD_SAFE -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNOCDMF -DNOMD2 \
-DNODSA -DNOAES -DNODH -DNORIPE -DSTDLL_NAME=\"icatok\"
-AM_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 \
--DLITE=1 -DNOCDMF -DNOMD2 -DNODSA -DNOAES -DNODH -DNORIPE
-
libpkcs11_ica_la_SOURCES= ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
diff --git a/usr/lib/pkcs11/soft_stdll/Makefile.am
b/usr/lib/pkcs11/soft_stdll/Makefile.am
index 6f025d1..67ff394 100644
--- a/usr/lib/pkcs11/soft_stdll/Makefile.am
+++ b/usr/lib/pkcs11/soft_stdll/Makefile.am
@@ -8,7 +8,6 @@ libpkcs11_sw_la_LIBADD = -lpthread -lcrypto
libpkcs11_sw_la_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE \
-DSHALLOW=0 -DSWTOK=1 -DLITE=0 \
-DNOCDMF -DNOMD2 -DNODSA -DNORIPE
\
- -fPIC \
-I/usr/include -I. \
-I../../../include/pkcs11/stdll \
-I../../../include/pkcs11 \
diff --git a/usr/sbin/pkcscca_migrate/Makefile.am
b/usr/sbin/pkcscca_migrate/Makefile.am
index 793b43a..1dd47f0 100644
--- a/usr/sbin/pkcscca_migrate/Makefile.am
+++ b/usr/sbin/pkcscca_migrate/Makefile.am
@@ -6,6 +6,4 @@ pkcscca_migrate_SOURCES = cca_migrate.c loadsave_cca.c
pkcscca_migrate_CFLAGS = -DSPINXPL -DLINUX -DPROGRAM_NAME=\"$(@)\" -DNOODM
-DNODAE
pkcscca_migrate_LDFLAGS = -lcrypto -ldl
-AM_CFLAGS = -DSPINXPL -DLINUX -DPROGRAM_NAME=\"$(@)\" -DNOODM -DNODAE
-
INCLUDES = -I. -I../../include/pkcs11
diff --git a/usr/sbin/pkcsconf/Makefile.am b/usr/sbin/pkcsconf/Makefile.am
index 86986cf..b18f5e6 100644
--- a/usr/sbin/pkcsconf/Makefile.am
+++ b/usr/sbin/pkcsconf/Makefile.am
@@ -4,8 +4,6 @@ pkcsconf_LDFLAGS = -lpthread -ldl
pkcsconf_CFLAGS = -DSPINXPL -D_THREAD_SAFE -DDEBUG -DDEV -DAPI
-AM_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
index ef8b7ee..0266401 100644
--- a/usr/sbin/pkcsslotd/Makefile.am
+++ b/usr/sbin/pkcsslotd/Makefile.am
@@ -5,8 +5,5 @@ pkcsslotd_LDFLAGS = -lpthread
pkcsslotd_CFLAGS = -DSPINXPL -DPROGRAM_NAME=\"$(@)\" -DNOODM -DNODAE \
-I../. -I../../include/pkcs11 -I../../include/pkcs11/stdll
-AM_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.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
