I normally build with a common source directory and separate
build directories. That is not working with the current SVN.
Many of the Makefile.am files are pointing at the source
directories, when they should point at the build directories
for the src/opensc/include. They should also point at the
$(srcdir) for the *.exports files.
Also in libopensc, half of the pkcs15 routines use:
#include <opensc/pkcs15.h>
the others use
#include "pkcs15.h"
and some use:
#include "cardctl.h"
but some use
#include <opensc/cardctl.h>
This is inconsistent, and they should be one or the other.
pkcs15-piv.c
used
#include "cards.h"
but this is now included by internal.h.
The svn diff addresses the Makefile.am, and a few of
the include issues.
Thanks
--
Douglas E. Engert <[EMAIL PROTECTED]>
Argonne National Laboratory
9700 South Cass Avenue
Argonne, Illinois 60439
(630) 252-5444
Index: src/tools/Makefile.am
===================================================================
--- src/tools/Makefile.am (revision 3442)
+++ src/tools/Makefile.am (working copy)
@@ -12,7 +12,7 @@
endif
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
-INCLUDES = -I$(top_srcdir)/src/common -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
LIBS = $(top_builddir)/src/libopensc/libopensc.la \
$(top_builddir)/src/common/libcompat.la
Index: src/pkcs11/Makefile.am
===================================================================
--- src/pkcs11/Makefile.am (revision 3442)
+++ src/pkcs11/Makefile.am (working copy)
@@ -10,7 +10,7 @@
noinst_LTLIBRARIES = libpkcs11.la
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS) $(PTHREAD_CFLAGS)
-INCLUDES = -I$(top_srcdir)/src/pkcs15init -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/pkcs15init -I$(top_builddir)/src/include
OPENSC_PKCS11_INC = sc-pkcs11.h
OPENSC_PKCS11_SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c
slot.c \
@@ -29,7 +29,7 @@
endif
opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
- -export-symbols opensc-pkcs11.exports \
+ -export-symbols $(srcdir)/opensc-pkcs11.exports \
-module -avoid-version -no-undefined
onepin_opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC)
hack-enabled.c
@@ -38,7 +38,7 @@
endif
onepin_opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
- -export-symbols opensc-pkcs11.exports \
+ -export-symbols $(srcdir)/opensc-pkcs11.exports \
-module -avoid-version -no-undefined
Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am (revision 3442)
+++ src/tests/Makefile.am (working copy)
@@ -4,7 +4,7 @@
SUBDIRS = regression
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
-INCLUDES = -I$(top_srcdir)/src/common -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
LIBS = $(top_builddir)/src/libopensc/libopensc.la \
$(top_builddir)/src/common/libcompat.la
Index: src/signer/Makefile.am
===================================================================
--- src/signer/Makefile.am (revision 3442)
+++ src/signer/Makefile.am (working copy)
@@ -8,7 +8,7 @@
endif
AM_CFLAGS = $(OPENSSL_CFLAGS) $(LIBASSUAN_CFLAGS)
-INCLUDES = -I$(srcdir)/npinclude -I$(top_srcdir)/src/include
+INCLUDES = -I$(srcdir)/npinclude -I$(top_builddir)/src/include
opensc_signer_la_CFLAGS = $(AM_CFLAGS) -DXP_UNIX
opensc_signer_la_SOURCES = opensc-crypto.c opensc-support.c signer.c stubs.c
dialog.c \
@@ -16,7 +16,7 @@
opensc_signer_la_LIBADD = $(OPENSSL_LIBS) $(LIBASSUAN_LIBS) \
$(top_builddir)/src/libopensc/libopensc.la
opensc_signer_la_LDFLAGS = $(AM_LDFLAGS) \
- -export-symbols signer.exports \
+ -export-symbols $(srcdir)/signer.exports \
-module -avoid-version -no-undefined
if ENABLE_NSPLUGIN
Index: src/pkcs15init/Makefile.am
===================================================================
--- src/pkcs15init/Makefile.am (revision 3442)
+++ src/pkcs15init/Makefile.am (working copy)
@@ -25,7 +25,7 @@
DEFS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS)
-INCLUDES = -I$(top_srcdir)/src/common -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
libpkcs15init_la_SOURCES = \
pkcs15-lib.c profile.c keycache.c \
@@ -43,7 +43,7 @@
$(top_builddir)/src/common/libcompat.la
libpkcs15init_la_LDFLAGS = $(AM_LDFLAGS) \
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
- -export-symbols pkcs15init.exports \
+ -export-symbols $(srcdir)/pkcs15init.exports \
-no-undefined
versioninfo.rc:
Index: src/scconf/Makefile.am
===================================================================
--- src/scconf/Makefile.am (revision 3442)
+++ src/scconf/Makefile.am (working copy)
@@ -21,7 +21,7 @@
libscconf_la_LIBADD = $(top_builddir)/src/common/libcompat.la
libscconf_la_LDFLAGS = $(AM_LDFLAGS) \
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
- -export-symbols scconf.exports \
+ -export-symbols $(srcdir)/scconf.exports \
-no-undefined
test_conf_SOURCES = test-conf.c
Index: src/libopensc/pkcs15-rutoken.c
===================================================================
--- src/libopensc/pkcs15-rutoken.c (revision 3442)
+++ src/libopensc/pkcs15-rutoken.c (working copy)
@@ -28,7 +28,7 @@
#include <assert.h>
#include <stdarg.h>
#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
+#include "cardctl.h"
#include <opensc/log.h>
#include <opensc/pkcs15.h>
Index: src/libopensc/pkcs15-piv.c
===================================================================
--- src/libopensc/pkcs15-piv.c (revision 3442)
+++ src/libopensc/pkcs15-piv.c (working copy)
@@ -28,10 +28,8 @@
#include <string.h>
#include <stdio.h>
#include <ctype.h>
-#include <opensc/pkcs15.h>
-#include <opensc/log.h>
-#include <opensc/cardctl.h>
-#include <opensc/cards.h>
+#include "pkcs15.h"
+#include "cardctl.h"
#define MANU_ID "piv_II "
Index: src/libopensc/pkcs15-prkey-rutoken.c
===================================================================
--- src/libopensc/pkcs15-prkey-rutoken.c (revision 3442)
+++ src/libopensc/pkcs15-prkey-rutoken.c (working copy)
@@ -28,7 +28,7 @@
#include <assert.h>
#include <opensc/opensc.h>
#include <opensc/pkcs15.h>
-#include <opensc/rutoken.h>
+#include "rutoken.h"
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#elif defined(HAVE_STDINT_H)
Index: src/libopensc/Makefile.am
===================================================================
--- src/libopensc/Makefile.am (revision 3442)
+++ src/libopensc/Makefile.am (working copy)
@@ -17,7 +17,7 @@
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \
$(OPTIONAL_ZLIB_CFLAGS) $(LTLIB_CFLAGS)
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/common
libopensc_la_SOURCES = \
sc.c ctx.c ui.c log.c errors.c \
@@ -58,7 +58,7 @@
endif
libopensc_la_LDFLAGS = $(AM_LDFLAGS) \
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
- -export-symbols libopensc.exports \
+ -export-symbols $(srcdir)/libopensc.exports \
-no-undefined
versioninfo.rc:
_______________________________________________
opensc-devel mailing list
[email protected]
http://www.opensc-project.org/mailman/listinfo/opensc-devel
