From d74ddd78937506436ba1ec8ebfbbd8a2cdaf0cc0 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 13 Feb 2019 10:33:59 +0100 Subject: [PATCH] xfrmi: Move to a separate directory to fix monolithic build --- configure.ac | 1 + src/Makefile.am | 4 ++++ src/libcharon/plugins/kernel_netlink/.gitignore | 1 - src/libcharon/plugins/kernel_netlink/Makefile.am | 7 ------- src/xfrmi/.gitignore | 1 + src/xfrmi/Makefile.am | 13 +++++++++++++ .../plugins/kernel_netlink => xfrmi}/xfrmi.c | 0 7 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 src/xfrmi/.gitignore create mode 100644 src/xfrmi/Makefile.am rename src/{libcharon/plugins/kernel_netlink => xfrmi}/xfrmi.c (100%) diff --git a/configure.ac b/configure.ac index 62f8c11e8c..f01b078623 100644 --- a/configure.ac +++ b/configure.ac @@ -2009,6 +2009,7 @@ AC_CONFIG_FILES([ src/sw-collector/Makefile src/sec-updater/Makefile src/swanctl/Makefile + src/xfrmi/Makefile scripts/Makefile testing/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index 6eacbe2930..b28aba75e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -143,3 +143,7 @@ endif if USE_TPM SUBDIRS += tpm_extendpcr endif + +if USE_KERNEL_NETLINK + SUBDIRS += xfrmi +endif diff --git a/src/libcharon/plugins/kernel_netlink/.gitignore b/src/libcharon/plugins/kernel_netlink/.gitignore index 5d4f4c8975..e05064df6e 100644 --- a/src/libcharon/plugins/kernel_netlink/.gitignore +++ b/src/libcharon/plugins/kernel_netlink/.gitignore @@ -1,2 +1 @@ kernel_netlink_tests -xfrmi diff --git a/src/libcharon/plugins/kernel_netlink/Makefile.am b/src/libcharon/plugins/kernel_netlink/Makefile.am index 1600f8ece5..71bc09d5ba 100644 --- a/src/libcharon/plugins/kernel_netlink/Makefile.am +++ b/src/libcharon/plugins/kernel_netlink/Makefile.am @@ -24,13 +24,6 @@ libstrongswan_kernel_netlink_la_LIBADD = $(DLLIB) libstrongswan_kernel_netlink_la_LDFLAGS = -module -avoid-version -ipsec_PROGRAMS = xfrmi -xfrmi_SOURCES = xfrmi.c -xfrmi_LDADD = \ - libstrongswan-kernel-netlink.la \ - $(top_builddir)/src/libstrongswan/libstrongswan.la \ - $(top_builddir)/src/libcharon/libcharon.la - TESTS = kernel_netlink_tests check_PROGRAMS = $(TESTS) diff --git a/src/xfrmi/.gitignore b/src/xfrmi/.gitignore new file mode 100644 index 0000000000..53b7fe780f --- /dev/null +++ b/src/xfrmi/.gitignore @@ -0,0 +1 @@ +xfrmi \ No newline at end of file diff --git a/src/xfrmi/Makefile.am b/src/xfrmi/Makefile.am new file mode 100644 index 0000000000..c9fedcf17f --- /dev/null +++ b/src/xfrmi/Makefile.am @@ -0,0 +1,13 @@ +ipsec_PROGRAMS = xfrmi + +xfrmi_SOURCES = xfrmi.c + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libstrongswan \ + -I$(top_srcdir)/src/libcharon \ + -I$(top_srcdir)/src/libcharon/plugins/kernel_netlink + +xfrmi_LDADD = \ + $(top_builddir)/src/libcharon/plugins/kernel_netlink/libstrongswan-kernel-netlink.la \ + $(top_builddir)/src/libstrongswan/libstrongswan.la \ + $(top_builddir)/src/libcharon/libcharon.la diff --git a/src/libcharon/plugins/kernel_netlink/xfrmi.c b/src/xfrmi/xfrmi.c similarity index 100% rename from src/libcharon/plugins/kernel_netlink/xfrmi.c rename to src/xfrmi/xfrmi.c -- 2.47.2