Header file cleanup.

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

Makefile.mak

@@ -1,5 +1,5 @@
 
-SUBDIRS = src
+SUBDIRS = win32 src
 
 all::
 

configure.ac

@@ -652,13 +652,9 @@ AC_DEFINE_UNQUOTED([OPENSC_VERSION_MINOR], [${OPENSC_VERSION_MINOR}], [OpenSC ve
 AC_DEFINE_UNQUOTED([OPENSC_VERSION_FIX], [${OPENSC_VERSION_FIX}], [OpenSC version fix component])
 AC_DEFINE_UNQUOTED([OPENSC_FEATURES], ["${OPENSC_FEATURES}"], [Enabled OpenSC features])
 
-openscincludedir="\$(includedir)/opensc"
 pkcs11dir="\$(libdir)/pkcs11"
-pkgconfigdir="\$(libdir)/pkgconfig"
 
-AC_SUBST([openscincludedir])
 AC_SUBST([pkcs11dir])
-AC_SUBST([pkgconfigdir])
 AC_SUBST([xslstylesheetsdir])
 AC_SUBST([OPENSC_VERSION_MAJOR])
 AC_SUBST([OPENSC_VERSION_MINOR])
@@ -713,9 +709,6 @@ AC_CONFIG_FILES([
  etc/Makefile
  src/Makefile
  src/common/Makefile
- src/include/Makefile
- src/include/winconfig.h
- src/include/opensc/Makefile
  src/libopensc/Makefile
  src/libopensc/libopensc.pc
  src/pkcs11/Makefile
@@ -728,6 +721,7 @@ AC_CONFIG_FILES([
  src/cardmod/cardmod.inf
  win32/Makefile
  win32/versioninfo.rc
+ win32/winconfig.h
 ])
 AC_OUTPUT
 

src/Makefile.am

@@ -2,5 +2,5 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 EXTRA_DIST = Makefile.mak
 
 # Order IS important
-SUBDIRS = common include scconf pkcs15init libopensc pkcs11 \
+SUBDIRS = common scconf pkcs15init libopensc pkcs11 \
  tools tests cardmod

src/Makefile.mak

@@ -2,7 +2,7 @@ TOPDIR = ..
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
-SUBDIRS = include common scconf pkcs15init libopensc pkcs11 tools tests cardmod
+SUBDIRS = common scconf pkcs15init libopensc pkcs11 tools tests cardmod
 
 all::
 

src/cardmod/Makefile.am

@@ -12,9 +12,7 @@ else
 dist_noinst_DATA = cardmod.inf cardmod-westcos.reg
 endif
 
-INCLUDES = -I$(top_builddir)/src/include \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/libopensc
+INCLUDES = -I$(top_srcdir)/src
 
 opensc_cardmod@LIBRARY_BITNESS@_la_SOURCES = cardmod.c cardmod.exports \
  $(top_builddir)/win32/versioninfo.rc

src/cardmod/cardmod.c

@@ -27,21 +27,18 @@
 #pragma managed(push, off)
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <windows.h>
-#include <cardmod.h>
-
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
+#include "config.h"
 
 #include <log.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <windows.h>
+#include <cardmod.h>
+
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
+
 #define NULLSTR(a) (a == NULL ? "<NULL>" : a)
 #define NULLWSTR(a) (a == NULL ? L"<NULL>" : a)
 

src/common/Makefile.am

@@ -14,6 +14,5 @@ libcompat_la_SOURCES = \
  compat_strlcpy.h compat_strlcpy.c \
  compat_getpass.h compat_getpass.c \
  compat_getopt.h compat_getopt.c \
- simclist.c
+ simclist.c simclist.h
 
-openscinclude_HEADERS = simclist.h

src/common/compat_getopt.c

@@ -23,16 +23,15 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifndef HAVE_GETOPT_H
 
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
 #include "compat_getopt.h"
 
 int my_optind=1, my_opterr=1, my_optopt=0;

src/common/compat_getpass.c

@@ -1,9 +1,10 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#ifndef HAVE_GETPASS
+#include "config.h"
+
+#ifndef HAVE_GETPASS /* empty file if getpass is available */
 #include <stdio.h>
+
 #include "compat_getpass.h"
+
 #ifdef _WIN32
 char *getpass(const char *prompt)
 {
@@ -24,4 +25,4 @@ char *getpass(const char *prompt)
 #else
 #error Need getpass implementation
 #endif
-#endif
+#endif /* HAVE_GETPASS */

src/common/compat_strlcpy.c

@@ -17,8 +17,8 @@
  */
 
 #include "config.h"
-#ifndef HAVE_STRLCPY
 
+#ifndef HAVE_STRLCPY /* empty file if strlcpy is available */
 #include <sys/types.h>
 #include <string.h>
 
@@ -55,4 +55,4 @@ strlcpy(char *dst, const char *src, size_t siz)
  return(s - src - 1); /* count does not include NUL */
 }
 
-#endif
+#endif /* HAVE_STRLCPY */

src/libopensc/Makefile.am

@@ -5,19 +5,17 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 EXTRA_DIST = Makefile.mak 
 
 lib_LTLIBRARIES = libopensc.la
-openscinclude_HEADERS = \
+noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.h \
+ internal-winscard.h p15card-helper.h \
  opensc.h pkcs15.h \
  cardctl.h asn1.h log.h \
  errors.h types.h compression.h
-noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.h \
- internal-winscard.h p15card-helper.h
-pkgconfig_DATA = libopensc.pc
 
 AM_CPPFLAGS = -DOPENSC_CONF_PATH=\"$(sysconfdir)/opensc.conf\"
 AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \
  $(OPTIONAL_PCSC_CFLAGS) $(OPTIONAL_ZLIB_CFLAGS) \
  $(OPTIONAL_ICONV_CFLAGS) $(LTLIB_CFLAGS)
-INCLUDES = -I$(top_builddir)/src/include -I$(top_srcdir)/src/common
+INCLUDES = -I$(top_srcdir)/src
 
 libopensc_la_SOURCES = \
  sc.c ctx.c log.c errors.c \

src/libopensc/apdu.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>

src/libopensc/asn1.c

@@ -18,14 +18,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "internal.h"
-#include "asn1.h"
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
 #include <stdlib.h>
 
+#include "internal.h"
+#include "asn1.h"
+
 static int asn1_decode(sc_context_t *ctx, struct sc_asn1_entry *asn1,
  const u8 *in, size_t len, const u8 **newp, size_t *len_left,
  int choice, int depth);

src/libopensc/asn1.h

@@ -25,8 +25,8 @@
 extern "C" {
 #endif
 
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
 
 struct sc_asn1_entry {
  const char *name;

src/libopensc/base64.c

@@ -18,12 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "internal.h"
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
 
+#include "internal.h"
+
 static const u8 base64_table[66] =
  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
  "0123456789+/=";

src/libopensc/card-acos5.c

@@ -18,7 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "config.h"
+
 #include <string.h>
+
 #include "internal.h"
 #include "cardctl.h"
 

src/libopensc/card-akis.c

@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 

src/libopensc/card-asepcos.c

@@ -16,10 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "internal.h"
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 
+#include "internal.h"
 #include "asn1.h"
 #include "cardctl.h"
 

src/libopensc/card-atrust-acos.c

@@ -20,11 +20,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
 #include "internal.h"
 #include "asn1.h"
 #include "cardctl.h"
-#include <stdlib.h>
-#include <string.h>
 
 /*****************************************************************************/
 

src/libopensc/card-belpic.c

@@ -80,11 +80,14 @@
  * language-selection functionality.
  */
 
-#include "internal.h"
-#include "log.h"
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
+#include "internal.h"
+#include "log.h"
+
 #ifdef BELPIC_PIN_PAD
 #ifndef HAVE_GUI
 #define HAVE_GUI

src/libopensc/card-cardos.c

@@ -21,12 +21,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "internal.h"
-#include "cardctl.h"
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 
-#include <opensc/asn1.h>
+#include "internal.h"
+#include "asn1.h"
+#include "cardctl.h"
 
 static const struct sc_card_operations *iso_ops = NULL;
 

src/libopensc/card-default.c

@@ -18,9 +18,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "internal.h"
+#include "config.h"
+
 #include <string.h>
 
+#include "internal.h"
+
 static struct sc_card_operations default_ops;
 static struct sc_card_driver default_drv = {
  "Default driver for unknown cards",

src/libopensc/card-entersafe.c

@@ -16,15 +16,18 @@
 
 /* Initially written by Weitao Sun ([email protected]) 2008 */
 
-#include "internal.h"
-#include "asn1.h"
-#include "cardctl.h"
+#include "config.h"
+#ifdef ENABLE_OPENSSL /* empty file without openssl */
+
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef ENABLE_OPENSSL
 #include <openssl/evp.h>
 
+#include "internal.h"
+#include "asn1.h"
+#include "cardctl.h"
+
 static struct sc_atr_table entersafe_atrs[] = {
  { 
  "3b:0f:00:65:46:53:05:19:05:71:df:00:00:00:00:00:00",