Rework the header structure

Currently fails to compile, unless you symlink
all the necessary headers to src/include/opensc
by yourself.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@459 c6295689-39f2-0310-b995-f0e70906c6a9

configure.in

@@ -994,7 +994,7 @@ if (test x$enable_debug = xyes); then
 	AC_DEFINE(DEBUG, 1, [Enable debug messages.])
 fi
 
-CPPFLAGS="-I\${top_srcdir}/src/libopensc -I\${top_srcdir}/src/scconf $CPPFLAGS"
+CPPFLAGS="-I\${top_srcdir}/src/include $CPPFLAGS"
 
 AC_SUBST(LIBSCCONF)
 LIBSCCONF="\${top_srcdir}/src/scconf/libscconf.la"
@@ -1016,7 +1016,7 @@ opensc_conf_path=`eval echo ${opensc_etc_path}/opensc.conf`
 AC_DEFINE_UNQUOTED(OPENSC_CONF_PATH, "$opensc_conf_path", [default config file for libopensc])
 
 AC_SUBST(CFLAGS_OPENSC)
-CFLAGS_OPENSC="-I\${top_srcdir}/src/libopensc"
+CFLAGS_OPENSC=""
 AC_SUBST(LIBOPENSC)
 LIBOPENSC="\${top_srcdir}/src/libopensc/libopensc.la"
 
@@ -1034,6 +1034,8 @@ docs/Makefile
 etc/Makefile
 src/Makefile
 src/common/Makefile
+src/include/Makefile
+src/include/opensc/Makefile
 src/libopensc/Makefile
 src/libopensc/opensc-config
 src/openssh/Makefile

src/include/.cvsignore

@@ -0,0 +1,18 @@
+.deps
+.libs
+.#*#
+.*.bak
+.*.orig
+.*.rej
+.*~
+#*#
+*.bak
+*.orig
+*.rej
+*~
+*.lo
+*.la
+gmon.out
+core
+Makefile
+Makefile.in

src/include/Makefile.am

@@ -0,0 +1,5 @@
+# Process this file with automake to create Makefile.in
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = . opensc

src/include/opensc/.cvsignore

@@ -0,0 +1,19 @@
+.deps
+.libs
+.#*#
+.*.bak
+.*.orig
+.*.rej
+.*~
+#*#
+*.bak
+*.orig
+*.rej
+*~
+*.lo
+*.la
+gmon.out
+core
+Makefile
+Makefile.in
+*.h

src/include/opensc/Makefile.am

@@ -0,0 +1,3 @@
+# Process this file with automake to create Makefile.in
+
+MAINTAINERCLEANFILES = Makefile.in

src/libopensc/asn1.h

@@ -21,8 +21,8 @@
 #ifndef _SC_ASN1_H
 #define _SC_ASN1_H
 
-#include "opensc.h"
-#include "pkcs15.h"
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
 
 struct sc_asn1_entry {
 	const char *name;

src/libopensc/emv.c

@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
 #include "emv.h"
 
 /* FIXME: Implement */

src/libopensc/emv.h

@@ -21,7 +21,7 @@
 #ifndef _OPENSC_EMV_H
 #define _OPENSC_EMV_H
 
-#include "opensc.h"
+#include <opensc/opensc.h>
 
 #ifdef  __cplusplus
 extern "C" {

src/libopensc/log.h

@@ -21,8 +21,8 @@
 #ifndef _SC_LOG_H
 #define _SC_LOG_H
 
-#include "opensc.h"
 #include <stdarg.h>
+#include <opensc/opensc.h>
 
 #define SC_LOG_TYPE_ERROR	0
 #define SC_LOG_TYPE_VERBOSE	1

src/libopensc/opensc.h

@@ -32,7 +32,7 @@
 #include <pthread.h>
 #endif
 
-#include <scconf.h>
+#include <opensc/scconf.h>
 
 #ifdef  __cplusplus
 extern "C" {

src/libopensc/pkcs15.h

@@ -21,7 +21,7 @@
 #ifndef _OPENSC_PKCS15_H
 #define _OPENSC_PKCS15_H
 
-#include "opensc.h"
+#include <opensc/opensc.h>
 
 #ifdef  __cplusplus
 extern "C" {

src/openssh/opensc-ssh.c

@@ -4,17 +4,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
-
-#include <opensc.h>
-#include <pkcs15.h>
-#include <string.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
 
 int quiet = 0;
 char *opt_outfile = NULL;

src/openssh/openssh-3.0.2p1-patch.diff

@@ -128,8 +128,8 @@ diff -u --unidirectional-new-file openssh-3.0.2p1-orig/scard-opensc.c openssh-3.
 +#include <openssl/rsa.h>
 +#include <openssl/x509.h>
 +
-+#include <opensc.h>
-+#include <pkcs15.h>
++#include <opensc/opensc.h>
++#include <opensc/pkcs15.h>
 +
 +#include "key.h"
 +#include "log.h"

src/pkcs11/sc-pkcs11.h

@@ -24,9 +24,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <opensc.h>
-#include <pkcs15.h>
-#include <log.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
+#include <opensc/log.h>
 #include "rsaref/pkcs11.h"
 
 #define SC_PKCS11_MAX_VIRTUAL_SLOTS	4

src/pkcs15init/pkcs15-cflex.c

@@ -21,10 +21,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <sys/types.h>
 #include <string.h>
+#include <sys/types.h>
 #include <openssl/bn.h>
-#include "opensc.h"
+#include <opensc/opensc.h>
 #include "pkcs15-init.h"
 #include "profile.h"
 

src/pkcs15init/pkcs15-gpk.c

@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <openssl/bn.h>
-#include "opensc.h"
-#include "cardctl.h"
+#include <opensc/opensc.h>
+#include <opensc/cardctl.h>
 #include "pkcs15-init.h"
 #include "profile.h"
 

src/pkcs15init/pkcs15-init.h

@@ -7,9 +7,9 @@
 #ifndef PKCS15_INIT_H
 #define PKCS15_INIT_H
 
-#include <pkcs15.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
+#include <opensc/pkcs15.h>
 
 struct sc_profile; /* opaque type */
 

src/pkcs15init/pkcs15-lib.c

@@ -43,7 +43,7 @@
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/pkcs12.h>
-#include "pkcs15.h"
+#include <opensc/pkcs15.h>
 #include "profile.h"
 #include "pkcs15-init.h"
 

src/pkcs15init/pkcs15-miocos.c

@@ -21,11 +21,11 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <sys/types.h>
 #include <string.h>
+#include <sys/types.h>
 #include <openssl/bn.h>
-#include "opensc.h"
-#include "cardctl.h"
+#include <opensc/opensc.h>
+#include <opensc/cardctl.h>
 #include "pkcs15-init.h"
 #include "profile.h"
 

src/pkcs15init/profile.c

@@ -27,9 +27,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
+#include <opensc/scconf.h>
 #include "pkcs15-init.h"
 #include "profile.h"
-#include <scconf.h>
 
 #define DEF_PRKEY_RSA_ACCESS	0x1D
 #define DEF_PRKEY_DSA_ACCESS	0x12

src/pkcs15init/profile.h

@@ -9,7 +9,7 @@
 
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
-#include "pkcs15.h"
+#include <opensc/pkcs15.h>
 
 #ifndef SC_PKCS15_PROFILE_DIRECTORY
 #define SC_PKCS15_PROFILE_DIRECTORY	"/usr/lib/opensc/profiles"
@@ -89,9 +89,11 @@ struct sc_profile {
 
 	struct pin_info *	pin_list;
 	struct auth_info *	auth_list;
-//	struct sc_key_template *prkey_list;
-//	struct sc_key_template *pubkey_list;
-//	struct sc_cert_template *cert_list;
+#if 0
+	struct sc_key_template *prkey_list;
+	struct sc_key_template *pubkey_list;
+	struct sc_cert_template *cert_list;
+#endif
 
 	unsigned int		pin_maxlen;
 	unsigned int		pin_minlen;

src/scam/Makefile.am

@@ -2,7 +2,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@ -I../scrandom -I../scldap
+INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
 
 if HAVE_PAM
 PAM = libpamscam.la

src/scam/p15_eid.c

@@ -29,12 +29,12 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/stat.h>
-#include <scrandom.h>
-#include <opensc.h>
-#include <pkcs15.h>
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
+#include <opensc/scrandom.h>
 #include "scam.h"
 
 #if defined(PAM_SCAM)

src/scam/p15_ldap.c

@@ -29,12 +29,12 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/stat.h>
-#include <scrandom.h>
-#include <scldap.h>
-#include <opensc.h>
-#include <pkcs15.h>
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
+#include <opensc/scldap.h>
+#include <opensc/scrandom.h>
 #include "scam.h"
 
 #if defined(PAM_SCAM)

src/scam/scam.c

@@ -27,7 +27,7 @@
 #include <ctype.h>
 #include "scam.h"
 #ifdef ATR_SUPPORT
-#include <opensc.h>
+#include <opensc/opensc.h>
 #endif
 
 struct scam_framework_ops *scam_frameworks[] =

src/scldap/scldap.h

@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#include <scconf.h>
+#include <opensc/scconf.h>
 
 /* Hard limit, tables are allocated dynamically */
 #define SCLDAP_MAX_ENTRIES            16

src/scldap/test-ldap.c

@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
-#include <scldap.h>
+#include "scldap.h"
 
 static void hex_dump_asc(FILE * f, const unsigned char *in, size_t count, int addr)
 {

src/signer/opensc-crypto.h

@@ -1,8 +1,8 @@
 #ifndef _OPENSC_CRYPTO_H
 #define _OPENSC_CRYPTO_H
 
-#include <pkcs15.h>
 #include <openssl/rsa.h>
+#include <opensc/pkcs15.h>
 
 struct sc_priv_data
 {

src/signer/signer.h

@@ -4,9 +4,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <opensc.h>
-#include <pkcs15.h>
 #include <X11/Intrinsic.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
 
 typedef struct _PluginInstance
 {

src/tests/base64.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include <opensc.h>
-#include <asn1.h>
+#include <opensc/opensc.h>
+#include <opensc/asn1.h>
 
 int main(int argc, char *argv[])
 {

src/tests/lottery.c

@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <opensc.h>
+#include <opensc/opensc.h>
 #include "sc-test.h"
 
 int main(int argc, char *argv[])

src/tests/p15dump.c

@@ -6,8 +6,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <opensc.h>
-#include <pkcs15.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
 #include "sc-test.h"
 
 struct sc_pkcs15_card *p15card;

src/tests/pintest.c

@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <opensc.h>
-#include <pkcs15.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
 #include "sc-test.h"
 
 struct sc_pkcs15_card *p15card;

src/tests/print.c

@@ -6,8 +6,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <opensc.h>
-#include <pkcs15.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
 #include "sc-test.h"
 
 struct sc_pkcs15_card *p15card;

src/tests/prngtest.c

@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <opensc.h>
+#include <opensc/opensc.h>
 #include "sc-test.h"
 
 int main(int argc, char *argv[])

src/tests/sc-test.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "opensc.h"
+#include <opensc/opensc.h>
 
 struct sc_context *ctx;
 struct sc_card *card;

src/tools/Makefile.am

@@ -2,7 +2,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
+INCLUDES = @CFLAGS_OPENSC@
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 if HAVE_SSL

src/tools/cryptoflex-tool.c

@@ -21,13 +21,13 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "util.h"
-#include <pkcs15.h>
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
+#include <opensc/pkcs15.h>
+#include "util.h"
 
 const char *app_name = "cryptoflex-tool";
 

src/tools/opensc-explorer.c

@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <opensc.h>
+#include <opensc/opensc.h>
 #ifdef HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
 #include <readline/history.h>

src/tools/opensc-tool.c

@@ -21,16 +21,15 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "util.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
 #include <string.h>
-#include <opensc.h>
-#include <sys/stat.h>
+#include <errno.h>
 #include <ctype.h>
+#include <sys/stat.h>
+#include <opensc/opensc.h>
+#include "util.h"
 
 #define OPT_CHANGE_PIN	0x100
 #define OPT_LIST_PINS	0x101

src/tools/pkcs15-crypt.c

@@ -21,15 +21,15 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "util.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <opensc.h>
-#include <pkcs15.h>
+#include <opensc/opensc.h>
+#include <opensc/pkcs15.h>
+#include "util.h"
 
 const char *app_name = "pkcs15-crypt";
 

src/tools/pkcs15-init.c

@@ -42,9 +42,9 @@
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/pkcs12.h>
-#include "pkcs15.h"
+#include <opensc/pkcs15.h>
+#include <opensc/pkcs15-init.h>
 #include "util.h"
-#include "pkcs15-init.h"
 
 const char *app_name = "pkcs15-init";
 

src/tools/pkcs15-tool.c

@@ -21,8 +21,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <opensc/pkcs15.h>
 #include "util.h"
-#include <pkcs15.h>
 
 const char *app_name = "pkcs15-tool";
 

src/tools/util.h

@@ -12,9 +12,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <opensc.h>
+#include <sys/stat.h>
+#include <opensc/opensc.h>
 
 extern const struct option options[];
 extern const char *option_help[];