Also make sure we have -DDEBUG in the CFLAGS for when --enable-debug
  has been requested. This will probably add a lot of debugging output
  when set.

Signed-off-by: Klaus Heinrich Kiwi <[email protected]>
---
 configure.in                          |    2 +-
 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/soft_stdll/Makefile.am |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index d13cc2d..ee87afe 100644
--- a/configure.in
+++ b/configure.in
@@ -201,7 +201,7 @@ dnl ---
 dnl --- enable_debug
 AM_CONDITIONAL([ENABLE_DEBUG], [test "x$enable_debug" = "xyes"])
 if test "x$enable_debug" = "xyes"; then
-       CFLAGS="$cmdline_CFLAGS -g -O0"
+       CFLAGS="$cmdline_CFLAGS -g3 -O0 -DDEBUG"
 fi
 
 dnl --- first, check what external software is present or specified
diff --git a/usr/lib/pkcs11/aep_stdll/Makefile.am 
b/usr/lib/pkcs11/aep_stdll/Makefile.am
index a65fda9..812c484 100644
--- a/usr/lib/pkcs11/aep_stdll/Makefile.am
+++ b/usr/lib/pkcs11/aep_stdll/Makefile.am
@@ -7,7 +7,7 @@ $(AEP_LIB_DIRS) -nostartfiles -shared 
-Wl,-soname,PKCS11_AEP.so.1 -lc   \
 # Not all versions of automake observe libname_CFLAGS
 opencryptoki_stdll_libpkcs11_aep_la_CFLAGS = -DSPINXPL -DDEV           \
 -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -DNOCDMF -DNOMD2   \
--DNODSA -DDEBUGON -DAEP_GENERIC -DNORIPE -DSTDLL_NAME=\"aeptok\"
+-DNODSA -DAEP_GENERIC -DNORIPE -DSTDLL_NAME=\"aeptok\"
 
 opencryptoki_stdll_libpkcs11_aep_la_SOURCES = ../common/asn1.c         \
 ../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c                        
\
diff --git a/usr/lib/pkcs11/bcom_stdll/Makefile.am 
b/usr/lib/pkcs11/bcom_stdll/Makefile.am
index fe368ce..de285bd 100644
--- a/usr/lib/pkcs11/bcom_stdll/Makefile.am
+++ b/usr/lib/pkcs11/bcom_stdll/Makefile.am
@@ -9,7 +9,7 @@ VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
 # Not all versions of automake observe libname_CFLAGS
 opencryptoki_stdll_libpkcs11_bc_la_CFLAGS = -DSPINXPL -DDEV            \
 -D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA -DNOAES       \
--DNODH -DDEBUGON -DNORIPE -DSTDLL_NAME=\"bcomtok\"
+-DNODH -DNORIPE -DSTDLL_NAME=\"bcomtok\"
 
 opencryptoki_stdll_libpkcs11_bc_la_SOURCES = ../common/asn1.c  \
 ../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c                \
diff --git a/usr/lib/pkcs11/cr_stdll/Makefile.am 
b/usr/lib/pkcs11/cr_stdll/Makefile.am
index 9658551..6e4ef63 100644
--- a/usr/lib/pkcs11/cr_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cr_stdll/Makefile.am
@@ -8,7 +8,7 @@ VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
 
 # Not all versions of automake observe libname_CFLAGS
 opencryptoki_stdll_libpkcs11_cr_la_CFLAGS = -DSPINXPL -DDEV            \
--D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA -DDEBUGON
+-D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA
 
 opencryptoki_stdll_libpkcs11_cr_la_SOURCES = ../common/asn1.c  \
 ../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c                \
diff --git a/usr/lib/pkcs11/soft_stdll/Makefile.am 
b/usr/lib/pkcs11/soft_stdll/Makefile.am
index 70dc740..7d3ed3d 100644
--- a/usr/lib/pkcs11/soft_stdll/Makefile.am
+++ b/usr/lib/pkcs11/soft_stdll/Makefile.am
@@ -7,7 +7,7 @@ opencryptoki_stdll_libpkcs11_sw_la_LDFLAGS = -shared 
-Wl,-Bsymbolic     \
 opencryptoki_stdll_libpkcs11_sw_la_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE  \
                                            -DSHALLOW=0 -DSWTOK=1 -DLITE=0  \
                                            -DNOCDMF -DNOMD2 -DNODSA -DNORIPE   
    \
-                                           -DDEBUGON -fPIC                 \
+                                           -fPIC                   \
                                            -I/usr/include -I.              \
                                            -I../../../include/pkcs11/stdll \
                                            -I../../../include/pkcs11       \
-- 
1.7.2.3


------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech

Reply via email to