X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=src%2Fscepclient%2FMakefile.am;h=57b20dfb533c576be66eaf2788a06d8c3598e4d8;hp=079e25a3575e8f26132831e2761942f9a9009c7a;hb=a066f7e6c260bc46eb9b54ca5333121766d8c438;hpb=7626bef673a10b774db65c76e09d6c1f7056be83;ds=sidebyside

diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index 079e25a..57b20df 100644
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -1,27 +1,41 @@
 ipsec_PROGRAMS = scepclient
-scepclient_SOURCES = rsakey.c rsakey.h pkcs10.c pkcs10.h scep.c scep.h scepclient.c
+scepclient_SOURCES = scepclient.c rsakey.c rsakey.h pkcs10.c pkcs10.h scep.c scep.h loglite.c 
+
+PLUTODIR=$(top_srcdir)/src/pluto
+OPENACDIR=$(top_srcdir)/src/openac
+WHACKDIR=$(top_srcdir)/src/whack
+LIBFREESWANDIR=$(top_srcdir)/src/libfreeswan
+LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan
+LIBCRYPTODIR=$(top_srcdir)/src/libcrypto
+
+INCLUDES = \
+-I$(LIBFREESWANDIR) \
+-I$(LIBSTRONGSWANDIR) \
+-I$(PLUTODIR) \
+-I$(LIBCRYPTODIR) \
+-I$(WHACKDIR)
 
-INCLUDES = -I$(top_srcdir)/src/libfreeswan -I$(top_srcdir)/src/pluto -I$(top_srcdir)/src/whack -I$(top_srcdir)/src/libcrypto
 AM_CFLAGS = -DDEBUG -DNO_PLUTO -DIPSEC_CONFDIR=\"${confdir}\"
+
 scepclient_LDADD = asn1.o ca.o crl.o certs.o constants.o defs.o fetch.o id.o \
                    keys.o lex.o md2.o md5.o mp_defs.o ocsp.o oid.o pem.o pgp.o \
-                   pkcs1.o pkcs7.o rnd.o sha1.o smartcard.o x509.o loglite.o \
-                   $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a \
+                   pkcs1.o pkcs7.o rnd.o sha1.o smartcard.o x509.o \
+                   $(LIBFREESWANDIR)/libfreeswan.a $(LIBCRYPTODIR)/libcrypto.a \
                    -lgmp
 
 # This compile option activates smartcard support
 if USE_SMARTCARD
+  AM_CFLAGS += -DSMARTCARD
   scepclient_LDADD += -ldl
 endif
 
-dist_man_MANS = scepclient.8
-
-PLUTODIR=$(top_srcdir)/src/pluto
-OPENACDIR=$(top_srcdir)/src/openac
-
+# This compile option activates dynamic URL fetching using libcurl
+if USE_CURL
+  AM_CFLAGS += -DLIBCURL
+  scepclient_LDADD += -lcurl
+endif
 
-loglite.o:	$(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
-		$(COMPILE) $(INCLUDES) -c -o $@ $<
+dist_man_MANS = scepclient.8
 
 asn1.o :	$(PLUTODIR)/asn1.c $(PLUTODIR)/asn1.h
 		$(COMPILE) $(INCLUDES) -c -o $@ $<
@@ -65,8 +79,8 @@ md5.o :		$(PLUTODIR)/md5.c $(PLUTODIR)/md5.h
 ocsp.o :	$(PLUTODIR)/ocsp.c $(PLUTODIR)/ocsp.h
 		$(COMPILE) $(INCLUDES) -c -o $@ $<
 
-oid.o :		$(PLUTODIR)/oid.c $(PLUTODIR)/oid.h
-		$(COMPILE) $(INCLUDES) -c -o $@ $<
+oid.o :		$(LIBSTRONGSWANDIR)/asn1/oid.c $(LIBSTRONGSWANDIR)/asn1/oid.h
+		$(COMPILE) -c -o $@ $<
 
 pem.o :		$(PLUTODIR)/pem.c $(PLUTODIR)/pem.h
 		$(COMPILE) $(INCLUDES) -c -o $@ $<
@@ -91,8 +105,3 @@ smartcard.o :	$(PLUTODIR)/smartcard.c $(PLUTODIR)/smartcard.h
 
 x509.o :	$(PLUTODIR)/x509.c $(PLUTODIR)/x509.h
 		$(COMPILE) $(INCLUDES) -c -o $@ $<
-
-# This compile option activates dynamic URL fetching using libcurl
-if USE_LIBCURL
-  scepclient_LDADD += -lcurl
-endif