libhydra: Remove empty unused library
This commit is contained in:
@@ -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}\"
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <libgen.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
#include <library.h>
|
||||
#include <utils/backtrace.h>
|
||||
@@ -256,14 +255,6 @@ int main(int argc, char *argv[])
|
||||
exit(status);
|
||||
}
|
||||
|
||||
if (!libhydra_init())
|
||||
{
|
||||
dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name);
|
||||
libhydra_deinit();
|
||||
library_deinit();
|
||||
exit(status);
|
||||
}
|
||||
|
||||
if (!libcharon_init())
|
||||
{
|
||||
dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name);
|
||||
@@ -391,7 +382,6 @@ int main(int argc, char *argv[])
|
||||
deinit:
|
||||
destroy_dh_mapping();
|
||||
libcharon_deinit();
|
||||
libhydra_deinit();
|
||||
library_deinit();
|
||||
tkm_deinit();
|
||||
return status;
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
#include <tests/test_runner.h>
|
||||
|
||||
#include <library.h>
|
||||
#include <hydra.h>
|
||||
#include <daemon.h>
|
||||
|
||||
#include "tkm.h"
|
||||
@@ -50,7 +49,6 @@ static bool test_runner_init(bool init)
|
||||
|
||||
if (init)
|
||||
{
|
||||
libhydra_init();
|
||||
libcharon_init();
|
||||
lib->settings->set_int(lib->settings,
|
||||
"test-runner.filelog.stdout.default", 0);
|
||||
@@ -74,8 +72,6 @@ static bool test_runner_init(bool init)
|
||||
|
||||
plugin_loader_add_plugindirs(BUILDDIR "/src/libstrongswan/plugins",
|
||||
PLUGINS);
|
||||
plugin_loader_add_plugindirs(BUILDDIR "/src/libhydra/plugins",
|
||||
PLUGINS);
|
||||
plugin_loader_add_plugindirs(BUILDDIR "/src/libcharon/plugins",
|
||||
PLUGINS);
|
||||
if (charon->initialize(charon, PLUGINS))
|
||||
@@ -95,7 +91,6 @@ static bool test_runner_init(bool init)
|
||||
|
||||
destroy_dh_mapping();
|
||||
libcharon_deinit();
|
||||
libhydra_deinit();
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user