Link pluto and charon to libhydra, fixes monolithic build.
authorTobias Brunner <tobias@strongswan.org>
Wed, 24 Mar 2010 10:58:44 +0000 (11:58 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 24 Mar 2010 17:53:10 +0000 (18:53 +0100)
src/charon/Makefile.am
src/pluto/Makefile.am

index 0018000..041868b 100644 (file)
@@ -7,7 +7,11 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
 AM_CFLAGS = \
        -DIPSEC_DIR=\"${ipsecdir}\" \
        -DIPSEC_PIDDIR=\"${piddir}\"
-charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libcharon/libcharon.la -lm $(PTHREADLIB) $(DLLIB)
+charon_LDADD = \
+       $(top_builddir)/src/libstrongswan/libstrongswan.la \
+       $(top_builddir)/src/libhydra/libhydra.la \
+       $(top_builddir)/src/libcharon/libcharon.la \
+       -lm $(PTHREADLIB) $(DLLIB)
 
 EXTRA_DIST = Android.mk
 
index b83e4be..a0ab0f4 100644 (file)
@@ -54,6 +54,7 @@ rsaref/pkcs11t.h rsaref/pkcs11.h rsaref/unix.h rsaref/pkcs11f.h
 _pluto_adns_SOURCES = adns.c adns.h
 
 LIBSTRONGSWANDIR=$(top_builddir)/src/libstrongswan
+LIBHYDRADIR=$(top_builddir)/src/libhydra
 LIBFREESWANDIR=$(top_builddir)/src/libfreeswan
 
 INCLUDES = \
@@ -74,6 +75,7 @@ AM_CFLAGS = \
 
 pluto_LDADD = \
 $(LIBSTRONGSWANDIR)/libstrongswan.la \
+$(LIBHYDRADIR)/libhydra.la \
 $(LIBFREESWANDIR)/libfreeswan.a \
 -lresolv $(PTHREADLIB) $(DLLIB)