xfrmi: Move to a separate directory to fix monolithic build

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
 ])

src/Makefile.am

@@ -143,3 +143,7 @@ endif
 if USE_TPM
   SUBDIRS += tpm_extendpcr
 endif
+
+if USE_KERNEL_NETLINK
+  SUBDIRS += xfrmi
+endif

src/libcharon/plugins/kernel_netlink/.gitignore

@@ -1,2 +1 @@
 kernel_netlink_tests
-xfrmi

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)

src/xfrmi/.gitignore

@@ -0,0 +1 @@
+xfrmi

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