diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2010-03-24 11:58:44 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2010-03-24 18:53:10 +0100 |
| commit | 39856897e61aa6df11254bbe4f2ebda5a3220e81 (patch) | |
| tree | fc870e64881bc4d42ac40012f5c0e2e2c4b0efe2 /src | |
| parent | bde5163ae04115443be71530ac9cfebcdd806c55 (diff) | |
| download | strongswan-39856897e61aa6df11254bbe4f2ebda5a3220e81.tar.bz2 strongswan-39856897e61aa6df11254bbe4f2ebda5a3220e81.tar.xz | |
Link pluto and charon to libhydra, fixes monolithic build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/charon/Makefile.am | 6 | ||||
| -rw-r--r-- | src/pluto/Makefile.am | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am index 00180003e..041868b7c 100644 --- a/src/charon/Makefile.am +++ b/src/charon/Makefile.am @@ -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 diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am index b83e4be33..a0ab0f4a6 100644 --- a/src/pluto/Makefile.am +++ b/src/pluto/Makefile.am @@ -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) |