From c6c7f97a1d104c9a78209500d17eb1a34f997790 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 4 Nov 2014 14:19:03 +0100 Subject: [PATCH] attr: Move plugin to libcharon --- configure.ac | 6 +++--- src/libcharon/Makefile.am | 7 +++++++ src/{libhydra => libcharon}/plugins/attr/Makefile.am | 3 ++- src/{libhydra => libcharon}/plugins/attr/attr_plugin.c | 0 src/{libhydra => libcharon}/plugins/attr/attr_plugin.h | 2 +- src/{libhydra => libcharon}/plugins/attr/attr_provider.c | 0 src/{libhydra => libcharon}/plugins/attr/attr_provider.h | 0 src/libhydra/Android.mk | 3 --- src/libhydra/Makefile.am | 7 ------- 9 files changed, 13 insertions(+), 15 deletions(-) rename src/{libhydra => libcharon}/plugins/attr/Makefile.am (84%) rename src/{libhydra => libcharon}/plugins/attr/attr_plugin.c (100%) rename src/{libhydra => libcharon}/plugins/attr/attr_plugin.h (98%) rename src/{libhydra => libcharon}/plugins/attr/attr_provider.c (100%) rename src/{libhydra => libcharon}/plugins/attr/attr_provider.h (100%) diff --git a/configure.ac b/configure.ac index 9d55b39fc..3e1e6fb64 100644 --- a/configure.ac +++ b/configure.ac @@ -1256,7 +1256,7 @@ ADD_PLUGIN([winhttp], [s charon pki scripts]) ADD_PLUGIN([soup], [s charon pki scripts nm cmd]) ADD_PLUGIN([mysql], [s charon pool manager medsrv attest]) ADD_PLUGIN([sqlite], [s charon pool manager medsrv attest]) -ADD_PLUGIN([attr], [h charon]) +ADD_PLUGIN([attr], [c charon]) ADD_PLUGIN([attr-sql], [h charon]) ADD_PLUGIN([load-tester], [c charon]) ADD_PLUGIN([kernel-libipsec], [c charon cmd]) @@ -1482,10 +1482,10 @@ AM_CONDITIONAL(USE_FARP, test x$farp = xtrue) AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue) AM_CONDITIONAL(USE_UNITY, test x$unity = xtrue) AM_CONDITIONAL(USE_RESOLVE, test x$resolve = xtrue) +AM_CONDITIONAL(USE_ATTR, test x$attr = xtrue) # hydra plugins # --------------- -AM_CONDITIONAL(USE_ATTR, test x$attr = xtrue) AM_CONDITIONAL(USE_ATTR_SQL, test x$attr_sql = xtrue) AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue) AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue) @@ -1649,7 +1649,6 @@ AC_CONFIG_FILES([ src/libstrongswan/plugins/test_vectors/Makefile src/libstrongswan/tests/Makefile src/libhydra/Makefile - src/libhydra/plugins/attr/Makefile src/libhydra/plugins/attr_sql/Makefile src/libhydra/plugins/kernel_netlink/Makefile src/libhydra/plugins/kernel_pfkey/Makefile @@ -1750,6 +1749,7 @@ AC_CONFIG_FILES([ src/libcharon/plugins/unit_tester/Makefile src/libcharon/plugins/load_tester/Makefile src/libcharon/plugins/resolve/Makefile + src/libcharon/plugins/attr/Makefile src/stroke/Makefile src/ipsec/Makefile src/starter/Makefile diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index 7f7e32155..5df7dbbf3 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -637,3 +637,10 @@ if MONOLITHIC libcharon_la_LIBADD += plugins/resolve/libstrongswan-resolve.la endif endif + +if USE_ATTR + SUBDIRS += plugins/attr +if MONOLITHIC + libcharon_la_LIBADD += plugins/attr/libstrongswan-attr.la +endif +endif diff --git a/src/libhydra/plugins/attr/Makefile.am b/src/libcharon/plugins/attr/Makefile.am similarity index 84% rename from src/libhydra/plugins/attr/Makefile.am rename to src/libcharon/plugins/attr/Makefile.am index 5b899b80c..6bc7e77d8 100644 --- a/src/libhydra/plugins/attr/Makefile.am +++ b/src/libcharon/plugins/attr/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/libstrongswan \ - -I$(top_srcdir)/src/libhydra + -I$(top_srcdir)/src/libhydra \ + -I$(top_srcdir)/src/libcharon AM_CFLAGS = \ $(PLUGIN_CFLAGS) diff --git a/src/libhydra/plugins/attr/attr_plugin.c b/src/libcharon/plugins/attr/attr_plugin.c similarity index 100% rename from src/libhydra/plugins/attr/attr_plugin.c rename to src/libcharon/plugins/attr/attr_plugin.c diff --git a/src/libhydra/plugins/attr/attr_plugin.h b/src/libcharon/plugins/attr/attr_plugin.h similarity index 98% rename from src/libhydra/plugins/attr/attr_plugin.h rename to src/libcharon/plugins/attr/attr_plugin.h index 29fb33839..0c6eebfa7 100644 --- a/src/libhydra/plugins/attr/attr_plugin.h +++ b/src/libcharon/plugins/attr/attr_plugin.h @@ -15,7 +15,7 @@ /** * @defgroup attr attr - * @ingroup hplugins + * @ingroup cplugins * * @defgroup attr_plugin attr_plugin * @{ @ingroup attr diff --git a/src/libhydra/plugins/attr/attr_provider.c b/src/libcharon/plugins/attr/attr_provider.c similarity index 100% rename from src/libhydra/plugins/attr/attr_provider.c rename to src/libcharon/plugins/attr/attr_provider.c diff --git a/src/libhydra/plugins/attr/attr_provider.h b/src/libcharon/plugins/attr/attr_provider.h similarity index 100% rename from src/libhydra/plugins/attr/attr_provider.h rename to src/libcharon/plugins/attr/attr_provider.h diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk index ff134da7b..fea4117b8 100644 --- a/src/libhydra/Android.mk +++ b/src/libhydra/Android.mk @@ -17,8 +17,6 @@ LOCAL_SRC_FILES := $(filter %.c,$(libhydra_la_SOURCES)) # adding the plugin source files -LOCAL_SRC_FILES += $(call add_plugin, attr) - LOCAL_SRC_FILES += $(call add_plugin, kernel-pfkey) LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink) @@ -42,4 +40,3 @@ LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES += libstrongswan include $(BUILD_SHARED_LIBRARY) - diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am index 71c42c3de..1877a0bfa 100644 --- a/src/libhydra/Makefile.am +++ b/src/libhydra/Makefile.am @@ -37,13 +37,6 @@ else SUBDIRS = . endif -if USE_ATTR - SUBDIRS += plugins/attr -if MONOLITHIC - libhydra_la_LIBADD += plugins/attr/libstrongswan-attr.la -endif -endif - if USE_ATTR_SQL SUBDIRS += plugins/attr_sql if MONOLITHIC