diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-11-01 13:32:07 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-11-01 13:32:07 +0100 |
| commit | 5313d2d78ca150515f7f5eb39801c100690b6b29 (patch) | |
| tree | c78e420367283bb1b16f14210b12687cdfbd26eb /src/libcharon/Makefile.am | |
| parent | 6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349 (diff) | |
| download | vyos-strongswan-5313d2d78ca150515f7f5eb39801c100690b6b29.tar.gz vyos-strongswan-5313d2d78ca150515f7f5eb39801c100690b6b29.zip | |
Imported Upstream version 5.1.1
Diffstat (limited to 'src/libcharon/Makefile.am')
| -rw-r--r-- | src/libcharon/Makefile.am | 57 |
1 files changed, 14 insertions, 43 deletions
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index 10d0b04cb..df58eaa10 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -136,7 +136,13 @@ AM_CPPFLAGS = \ -DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" -libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) +AM_LDFLAGS = \ + -no-undefined + +libcharon_la_LIBADD = \ + $(top_builddir)/src/libstrongswan/libstrongswan.la \ + $(top_builddir)/src/libhydra/libhydra.la \ + -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) EXTRA_DIST = Android.mk @@ -210,6 +216,13 @@ if MONOLITHIC endif endif +if USE_DNSCERT + SUBDIRS += plugins/dnscert +if MONOLITHIC + libcharon_la_LIBADD += plugins/dnscert/libstrongswan-dnscert.la +endif +endif + if USE_IPSECKEY SUBDIRS += plugins/ipseckey if MONOLITHIC @@ -385,48 +398,6 @@ if MONOLITHIC endif endif -if USE_TNC_IMC - SUBDIRS += plugins/tnc_imc -if MONOLITHIC - libcharon_la_LIBADD += plugins/tnc_imc/libstrongswan-tnc-imc.la -endif -endif - -if USE_TNC_IMV - SUBDIRS += plugins/tnc_imv -if MONOLITHIC - libcharon_la_LIBADD += plugins/tnc_imv/libstrongswan-tnc-imv.la -endif -endif - -if USE_TNC_TNCCS - SUBDIRS += plugins/tnc_tnccs -if MONOLITHIC - libcharon_la_LIBADD += plugins/tnc_tnccs/libstrongswan-tnc-tnccs.la -endif -endif - -if USE_TNCCS_11 - SUBDIRS += plugins/tnccs_11 -if MONOLITHIC - libcharon_la_LIBADD += plugins/tnccs_11/libstrongswan-tnccs-11.la -endif -endif - -if USE_TNCCS_20 - SUBDIRS += plugins/tnccs_20 -if MONOLITHIC - libcharon_la_LIBADD += plugins/tnccs_20/libstrongswan-tnccs-20.la -endif -endif - -if USE_TNCCS_DYNAMIC - SUBDIRS += plugins/tnccs_dynamic -if MONOLITHIC - libcharon_la_LIBADD += plugins/tnccs_dynamic/libstrongswan-tnccs-dynamic.la -endif -endif - if USE_LIBTNCCS if MONOLITHIC # otherwise this library is linked to the respective plugins |