Also drop automake-version related comments. --- configure.in | 2 +- usr/lib/pkcs11/aep_stdll/Makefile.am | 1 - usr/lib/pkcs11/api/Makefile.am | 1 - usr/lib/pkcs11/bcom_stdll/Makefile.am | 1 - usr/lib/pkcs11/cca_stdll/Makefile.am | 1 - usr/lib/pkcs11/cr_stdll/Makefile.am | 1 - usr/lib/pkcs11/ica_s390_stdll/Makefile.am | 1 - usr/lib/pkcs11/ica_stdll/Makefile.am | 2 -- usr/lib/pkcs11/leeds_stdll/Makefile.am | 1 - usr/lib/pkcs11/soft_stdll/Makefile.am | 1 - usr/lib/pkcs11/tpm_stdll/Makefile.am | 5 ----- usr/sbin/pkcscca_migrate/Makefile.am | 1 - usr/sbin/pkcsconf/Makefile.am | 2 -- usr/sbin/pkcsslotd/Makefile.am | 2 -- 14 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/configure.in b/configure.in index 7b5fb22..8c9ec6b 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.6]) +AM_INIT_AUTOMAKE([foreign 1.11]) dnl Checks for header files. AC_DISABLE_STATIC diff --git a/usr/lib/pkcs11/aep_stdll/Makefile.am b/usr/lib/pkcs11/aep_stdll/Makefile.am index 2d5f6c8..8c5e2be 100644 --- a/usr/lib/pkcs11/aep_stdll/Makefile.am +++ b/usr/lib/pkcs11/aep_stdll/Makefile.am @@ -4,7 +4,6 @@ libpkcs11_aep_la_LDFLAGS = $(LCRYPTO) \ $(AEP_LIB_DIRS) -nostartfiles -shared -Wl,-soname,PKCS11_AEP.so.1 -lc \ -lpthread -lcrypto -laep -# Not all versions of automake observe libname_CFLAGS libpkcs11_aep_la_CFLAGS = -DSPINXPL -DDEV \ -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -DNOCDMF -DNOMD2 \ -DNODSA -DAEP_GENERIC -DNORIPE -DSTDLL_NAME=\"aeptok\" diff --git a/usr/lib/pkcs11/api/Makefile.am b/usr/lib/pkcs11/api/Makefile.am index cb40fc0..a019107 100644 --- a/usr/lib/pkcs11/api/Makefile.am +++ b/usr/lib/pkcs11/api/Makefile.am @@ -8,7 +8,6 @@ libopencryptoki_la_LDFLAGS = -shared -Wl,-Bsymbolic -lc -ldl \ -lpthread -version-info \ $(SO_CURRENT):$(SO_REVISION):$(SO_AGE) -# Not all versions of automake observe libname_CFLAGS libopencryptoki_la_CFLAGS = -DSPINXPL -DAPI -DDEV -D_THREAD_SAFE \ -I../. -I../../../include/pkcs11 diff --git a/usr/lib/pkcs11/bcom_stdll/Makefile.am b/usr/lib/pkcs11/bcom_stdll/Makefile.am index 58b8db5..a10532a 100644 --- a/usr/lib/pkcs11/bcom_stdll/Makefile.am +++ b/usr/lib/pkcs11/bcom_stdll/Makefile.am @@ -6,7 +6,6 @@ libpkcs11_bc_la_LDFLAGS = $(LCRYPTO) $(BC_LIB_DIRS) \ VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -# Not all versions of automake observe libname_CFLAGS libpkcs11_bc_la_CFLAGS = -DSPINXPL -DDEV \ -D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA -DNOAES \ -DNODH -DNORIPE -DSTDLL_NAME=\"bcomtok\" diff --git a/usr/lib/pkcs11/cca_stdll/Makefile.am b/usr/lib/pkcs11/cca_stdll/Makefile.am index 1a935e8..928b111 100644 --- a/usr/lib/pkcs11/cca_stdll/Makefile.am +++ b/usr/lib/pkcs11/cca_stdll/Makefile.am @@ -6,7 +6,6 @@ # stdll_LTLIBRARIES=libpkcs11_cca.la -# Not all versions of automake observe libname_CFLAGS libpkcs11_cca_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \ -DNODSA -DNODH -DNOECB \ -I. -I../../../include -I../../../include/pkcs11 -I../common \ diff --git a/usr/lib/pkcs11/cr_stdll/Makefile.am b/usr/lib/pkcs11/cr_stdll/Makefile.am index 019baf1..2463058 100644 --- a/usr/lib/pkcs11/cr_stdll/Makefile.am +++ b/usr/lib/pkcs11/cr_stdll/Makefile.am @@ -6,7 +6,6 @@ libpkcs11_cr_la_LDFLAGS = $(LCRYPTO) $(CR_LIB_DIRS) \ VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -# Not all versions of automake observe libname_CFLAGS libpkcs11_cr_la_CFLAGS = -DSPINXPL -DDEV \ -D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA diff --git a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am index 6f4bfe5..15b256e 100644 --- a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am +++ b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am @@ -4,7 +4,6 @@ libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \ $(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,$@ \ -Wl,-Bsymbolic -lc -lpthread -lica -ldl -lcrypto -# Not all versions of automake observe libname_CFLAGS libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \ -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNODH \ -DNOCDMF -DNOMD2 -DNODSA -DSTDLL_NAME=\"icatok\" diff --git a/usr/lib/pkcs11/ica_stdll/Makefile.am b/usr/lib/pkcs11/ica_stdll/Makefile.am index 17ad10d..727deef 100644 --- a/usr/lib/pkcs11/ica_stdll/Makefile.am +++ b/usr/lib/pkcs11/ica_stdll/Makefile.am @@ -4,12 +4,10 @@ libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \ $(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic \ -Wl,-soname,PKCS11_ICA.so.1 -lc -lpthread -ldl -lica -# Not all versions of automake observe libname_CFLAGS libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \ -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNOCDMF -DNOMD2 \ -DNODSA -DNOAES -DNODH -DNORIPE -DSTDLL_NAME=\"icatok\" -# Not all versions of automake observe libname_CFLAGS AM_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 \ -DLITE=1 -DNOCDMF -DNOMD2 -DNODSA -DNOAES -DNODH -DNORIPE diff --git a/usr/lib/pkcs11/leeds_stdll/Makefile.am b/usr/lib/pkcs11/leeds_stdll/Makefile.am index f28417e..6450112 100644 --- a/usr/lib/pkcs11/leeds_stdll/Makefile.am +++ b/usr/lib/pkcs11/leeds_stdll/Makefile.am @@ -3,7 +3,6 @@ stdll_LTLIBRARIES=libpkcs11_4758.la libpkcs11_4758_la_LDFLAGS = $(SCC_LIBS) -nostartfiles -shared \ -Wl,-Bsymbolic -Wl,-soname,[email protected] -lpthread -lscc -ldl -# Not all versions of automake observe libname_CFLAGS libpkcs11_4758_la_CFLAGS = -DDEV -D_THREAD_SAFE -DLEEDS_BUILD libpkcs11_4758_la_SOURCES = host_api.c util.c diff --git a/usr/lib/pkcs11/soft_stdll/Makefile.am b/usr/lib/pkcs11/soft_stdll/Makefile.am index f508873..6612bf1 100644 --- a/usr/lib/pkcs11/soft_stdll/Makefile.am +++ b/usr/lib/pkcs11/soft_stdll/Makefile.am @@ -3,7 +3,6 @@ stdll_LTLIBRARIES = libpkcs11_sw.la libpkcs11_sw_la_LDFLAGS = -shared -Wl,-Bsymbolic \ -lc -lpthread -lcrypto -# Not all versions of automake observe libname_CFLAGS libpkcs11_sw_la_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE \ -DSHALLOW=0 -DSWTOK=1 -DLITE=0 \ -DNOCDMF -DNOMD2 -DNODSA -DNORIPE \ diff --git a/usr/lib/pkcs11/tpm_stdll/Makefile.am b/usr/lib/pkcs11/tpm_stdll/Makefile.am index ad7c134..74cbfbb 100644 --- a/usr/lib/pkcs11/tpm_stdll/Makefile.am +++ b/usr/lib/pkcs11/tpm_stdll/Makefile.am @@ -2,13 +2,8 @@ # Michael A. Halcrow <[email protected]> stdll_LTLIBRARIES=libpkcs11_tpm.la -AUTOMAKE_OPTIONS = gnu - -#VPATH = ../common - # TODO: -DLINUX and -DSPINXPL should be controlled via configure.in -# Not all versions of automake observe libname_CFLAGS libpkcs11_tpm_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \ -DNODSA -DNODH \ -I. -I../../../include \ diff --git a/usr/sbin/pkcscca_migrate/Makefile.am b/usr/sbin/pkcscca_migrate/Makefile.am index 94b4223..793b43a 100644 --- a/usr/sbin/pkcscca_migrate/Makefile.am +++ b/usr/sbin/pkcscca_migrate/Makefile.am @@ -6,7 +6,6 @@ pkcscca_migrate_SOURCES = cca_migrate.c loadsave_cca.c pkcscca_migrate_CFLAGS = -DSPINXPL -DLINUX -DPROGRAM_NAME=\"$(@)\" -DNOODM -DNODAE pkcscca_migrate_LDFLAGS = -lcrypto -ldl -# Not all versions of automake observe sbinname_CFLAGS 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 c028058..86986cf 100644 --- a/usr/sbin/pkcsconf/Makefile.am +++ b/usr/sbin/pkcsconf/Makefile.am @@ -2,10 +2,8 @@ sbin_PROGRAMS=pkcsconf pkcsconf_LDFLAGS = -lpthread -ldl -# Not all versions of automake observe sbinname_CFLAGS pkcsconf_CFLAGS = -DSPINXPL -D_THREAD_SAFE -DDEBUG -DDEV -DAPI -# Not all versions of automake observe sbinname_CFLAGS AM_CFLAGS = -DSPINXPL -D_THREAD_SAFE -DDEBUG -DDEV -DAPI pkcsconf_SOURCES = ../../lib/pkcs11/common/p11util.c pkcsconf.c diff --git a/usr/sbin/pkcsslotd/Makefile.am b/usr/sbin/pkcsslotd/Makefile.am index d2846c4..ef8b7ee 100644 --- a/usr/sbin/pkcsslotd/Makefile.am +++ b/usr/sbin/pkcsslotd/Makefile.am @@ -2,11 +2,9 @@ sbin_PROGRAMS=pkcsslotd pkcsslotd_LDFLAGS = -lpthread -# Not all versions of automake observe sbinname_CFLAGS pkcsslotd_CFLAGS = -DSPINXPL -DPROGRAM_NAME=\"$(@)\" -DNOODM -DNODAE \ -I../. -I../../include/pkcs11 -I../../include/pkcs11/stdll -# Not all versions of automake observe sbinname_CFLAGS AM_CFLAGS = -DSPINXPL -DPROGRAM_NAME=\"$(@)\" -DNOODM -DNODAE \ -I../. -I../../include/pkcs11 -I../../include/pkcs11/stdll -- 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
