Build fixes

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

src/Makefile.am

@@ -1,3 +1,4 @@
 # Process this file with automake to create Makefile.in
 
-SUBDIRS = common libopensc tests tools openssh pam pkcs11
+# Order IS important
+SUBDIRS = common scconf scldap scrandom libopensc tests tools openssh scam pam sia pkcs11

src/pam/Makefile.am

@@ -2,7 +2,7 @@
 
 libdir = ${prefix}/lib/security
 
-INCLUDES = @CFLAGS_PCSC@ @CFLAGS_SSP@ @CFLAGS_OPENSC@ -I../scam
+INCLUDES = @CFLAGS_PCSC@ @CFLAGS_SSP@ @CFLAGS_OPENSC@ -I../scam -I../scconf -I../scrandom -I../scldap
 
 if HAVE_LDAP
 LDAP_LTLIBS = @LIBSCLDAP@

src/scam/p15_eid.c

@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/stat.h>
-#include <scc/scrandom.h>
+#include <scrandom.h>
 #include <opensc.h>
 #include <opensc-pkcs15.h>
 #include <openssl/x509.h>

src/scam/p15_ldap.c

@@ -29,8 +29,8 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/stat.h>
-#include <scc/scrandom.h>
-#include <scc/scldap.h>
+#include <scrandom.h>
+#include <scldap.h>
 #include <opensc.h>
 #include <opensc-pkcs15.h>
 #include <openssl/x509.h>

src/scldap/Makefile.am

@@ -1,5 +1,9 @@
 # Process this file with automake to create Makefile.in
 
+SUBDIRS = . etc
+
+INCLUDES = -I../scconf
+
 include_HEADERS = scldap.h
 
 if HAVE_LDAP
@@ -12,7 +16,7 @@ endif
 
 lib_LTLIBRARIES = $(LDAP_LTLIB)
 libscldap_la_SOURCES = scldap.c scldap.h
-libscldap_la_LIBADD = @LIBLDAP@ libscconf.la
+libscldap_la_LIBADD = @LIBLDAP@ @LIBSCCONF@
 
 noinst_PROGRAMS = $(LDAP_PROGRAM)
 

src/scldap/test-ldap.c

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

src/scrandom/Makefile.am

@@ -2,16 +2,18 @@
 
 include_HEADERS = scrandom.h
 
-lib_LTLIBRARIES = libscrandom.la
-
 if HAVE_SSL
 SSL_LTLIB = @LIBCRYPTO@
 else
 SSL_LTLIB = 
 endif
 
+lib_LTLIBRARIES = libscrandom.la
+
 libscrandom_la_SOURCES = scrandom.c scrandom.h
 libscrandom_la_LIBADD = $(SSL_LTLIB)
 
+noinst_PROGRAMS = test-random
+
 test_random_SOURCES = test-random.c
 test_random_LDFLAGS = @LDFLAGS@ @LIBSCRANDOM@

src/scrandom/test-random.c

@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <scc/scrandom.h>
+#include <scrandom.h>
 
 int main(int argc, char **argv)
 {