aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am8
-rw-r--r--src/_copyright/Makefile.am2
-rw-r--r--src/starter/Makefile.am2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 913099c23..1e6d05034 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,13 @@
SUBDIRS = . include
-if USE_FILE_CONFIG
- SUBDIRS += libfreeswan starter ipsec _copyright
-endif
-
if USE_LIBSTRONGSWAN
SUBDIRS += libstrongswan
endif
+if USE_FILE_CONFIG
+ SUBDIRS += libfreeswan starter ipsec _copyright
+endif
+
if USE_PLUTO
SUBDIRS += libcrypto pluto whack
endif
diff --git a/src/_copyright/Makefile.am b/src/_copyright/Makefile.am
index 8b46f11a4..33c4ffc23 100644
--- a/src/_copyright/Makefile.am
+++ b/src/_copyright/Makefile.am
@@ -6,4 +6,4 @@ INCLUDES = \
-I$(top_srcdir)/src/libfreeswan \
-I$(top_srcdir)/src/libstrongswan
-_copyright_LDADD = $(top_builddir)/src/libfreeswan/libfreeswan.a
+_copyright_LDADD = $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 57205665f..7c84a256b 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
-I$(top_srcdir)/src/stroke
AM_CFLAGS = -DIPSEC_DIR=\"${ipsecdir}\" -DIPSEC_CONFDIR=\"${confdir}\" -DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_EAPDIR=\"${eapdir}\" -DDEBUG
-starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a
+starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la
EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf
dist_man_MANS = ipsec.conf.5 starter.8
MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c