aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2007-09-18 15:59:56 +0000
committerAndreas Steffen <andreas.steffen@strongswan.org>2007-09-18 15:59:56 +0000
commit3b4b26cdf389dd6a09b1caedffea90c8d6445b15 (patch)
tree833aee9b5c0e96d74186a57e56697fbe1cc6709e /src
parent740153e6f722dd56eee343b222acaaa2c1f5d4b9 (diff)
downloadstrongswan-3b4b26cdf389dd6a09b1caedffea90c8d6445b15.tar.bz2
strongswan-3b4b26cdf389dd6a09b1caedffea90c8d6445b15.tar.xz
moved loglite.c from openac to scepclient
Diffstat (limited to 'src')
-rw-r--r--src/scepclient/Makefile.am7
-rw-r--r--src/scepclient/loglite.c (renamed from src/openac/loglite.c)0
-rw-r--r--src/starter/Makefile.am4
3 files changed, 4 insertions, 7 deletions
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index be2280511..3a5f9839f 100644
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -1,5 +1,5 @@
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
@@ -19,7 +19,7 @@ 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 \
+ pkcs1.o pkcs7.o rnd.o sha1.o smartcard.o x509.o \
$(LIBFREESWANDIR)/libfreeswan.a $(LIBCRYPTODIR)/libcrypto.a \
-lgmp
@@ -35,9 +35,6 @@ endif
dist_man_MANS = scepclient.8
-loglite.o: $(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
- $(COMPILE) $(INCLUDES) -c -o $@ $<
-
asn1.o : $(PLUTODIR)/asn1.c $(PLUTODIR)/asn1.h
$(COMPILE) $(INCLUDES) -c -o $@ $<
diff --git a/src/openac/loglite.c b/src/scepclient/loglite.c
index 4219eb707..4219eb707 100644
--- a/src/openac/loglite.c
+++ b/src/scepclient/loglite.c
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index fdebf5182..4049d8d11 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -13,7 +13,7 @@ dist_man_MANS = ipsec.conf.5 starter.8
MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c
PLUTODIR=$(top_srcdir)/src/pluto
-OPENACDIR=$(top_srcdir)/src/openac
+SCEPCLIENTDIR=$(top_srcdir)/src/scepclient
lex.yy.c: y.tab.c parser.l parser.y parser.h
$(LEX) parser.l
@@ -27,7 +27,7 @@ y.tab.h: parser.l parser.y parser.h
keywords.c: keywords.txt keywords.h
$(GPERF) -C -G -t < keywords.txt > keywords.c
-loglite.o: $(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
+loglite.o: $(SCEPCLIENTDIR)/loglite.c $(PLUTODIR)/log.h
$(COMPILE) -c -o $@ $<
defs.o: $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h