swanctl: Pass optional connection name to --initiate/install/uninstall
[strongswan.git] / src / charon-tkm / Makefile.am
index c3da7d7..ad54eaf 100644 (file)
@@ -4,15 +4,13 @@ OBJ = $(abs_top_builddir)/src
 AM_CPPFLAGS = \
        -include $(abs_top_builddir)/config.h \
        -I$(SRC)/libstrongswan \
-       -I$(SRC)/libhydra \
        -I$(SRC)/libcharon
 
 LIBLD = \
        -L$(OBJ)/libstrongswan/.libs \
-       -L$(OBJ)/libhydra/.libs \
        -L$(OBJ)/libcharon/.libs
-LIBPT = $(OBJ)/libstrongswan/.libs:$(OBJ)/libhydra/.libs:$(OBJ)/libcharon/.libs
-LIBFL = -lstrongswan -lhydra -lcharon
+LIBPT = $(OBJ)/libstrongswan/.libs:$(OBJ)/libcharon/.libs
+LIBFL = -lstrongswan -lcharon
 
 DEFS += -DPLUGINS=\""$(PLUGINS)\"" -DIPSEC_PIDDIR=\"${piddir}\"
 
@@ -21,6 +19,10 @@ BUILD_OPTS = \
        -cargs $(AM_CPPFLAGS) $(DEFS) \
        -largs $(LIBLD) $(LIBFL)
 
+TEST_OPTS = \
+       -cargs -DBUILDDIR=\"${abs_top_builddir}\" \
+       -largs -L$(OBJ)/libstrongswan/tests/.libs -ltest
+
 # plugins to enable
 PLUGINS = \
        kernel-netlink \
@@ -35,15 +37,15 @@ build_charon: build_charon.gpr src/charon-tkm.c
        @$(GPRBUILD) -p $< $(BUILD_OPTS)
 
 build_tests: build_tests.gpr
-       @$(GPRBUILD) -p $< $(BUILD_OPTS) -cargs @CHECK_CFLAGS@ -largs @CHECK_LIBS@
+       @$(GPRBUILD) -p $< $(BUILD_OPTS) $(TEST_OPTS)
+
+check-tkm: build_tests
+       @LD_LIBRARY_PATH=$(LIBPT) obj/tests
 
-if UNITTESTS
-check: build_tests
-       @LD_LIBRARY_PATH=$(LIBPT) obj/test_runner
-else
 check:
-       @echo "reconfigure with --enable-unit-tests"
-endif
+       @echo "TKM tests are not run automatically because they have to be run as root" >&2
+       @echo "and require a properly configured TKM daemon to be running." >&2
+       @echo "They can be run from '$(abs_builddir)' with 'make check-tkm'" >&2
 
 install: build_charon
        $(INSTALL) -m 755 obj/charon-tkm $(DESTDIR)$(ipsecdir)