[libvirt] [PATCH 05/17] make: split secret driver build rules into secret/Makefile.inc.am

[Daniel P. Berrangé]

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 src/Makefile.am            | 29 +----------------------------
 src/secret/Makefile.inc.am | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 28 deletions(-)
 create mode 100644 src/secret/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index bbaab675f5..6518464639 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,6 +102,7 @@ include interface/Makefile.inc.am
 include network/Makefile.inc.am
 include nwfilter/Makefile.inc.am
 include node_device/Makefile.inc.am
+include secret/Makefile.inc.am
 
 
 THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
@@ -783,12 +784,10 @@ EXTRA_DIST += check-drivername.pl
 
 DRIVER_SOURCE_FILES += \
 	$(REMOTE_DRIVER_SOURCES) \
-	$(SECRET_DRIVER_SOURCES) \
 	$(STORAGE_DRIVER_SOURCES) \
 	$(NULL)
 
 STATEFUL_DRIVER_SOURCE_FILES += \
-	$(SECRET_DRIVER_SOURCES) \
 	$(STORAGE_DRIVER_SOURCES) \
 	$(NULL)
 
@@ -823,12 +822,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
 		security/virt-aa-helper.c
 
 
-SECRET_UTIL_SOURCES = \
-		secret/secret_util.h secret/secret_util.c
-
-SECRET_DRIVER_SOURCES = \
-		secret/secret_driver.h secret/secret_driver.c
-
 # Storage backend specific impls
 STORAGE_DRIVER_BACKEND_SOURCES = \
 		storage/storage_backend.h storage/storage_backend.c
@@ -981,12 +974,6 @@ libvirt_cpu_la_CFLAGS = \
 		-I$(srcdir)/conf $(AM_CFLAGS)
 libvirt_cpu_la_SOURCES = $(CPU_SOURCES)
 
-noinst_LTLIBRARIES += libvirt_secret.la
-libvirt_la_BUILT_LIBADD += libvirt_secret.la
-libvirt_secret_la_CFLAGS = $(AM_CFLAGS)
-libvirt_secret_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_secret_la_SOURCES = $(SECRET_UTIL_SOURCES)
-
 if WITH_VMX
 noinst_LTLIBRARIES += libvirt_vmx.la
 libvirt_la_BUILT_LIBADD += libvirt_vmx.la
@@ -1126,18 +1113,6 @@ EXTRA_DIST += \
 
 
 
-
-if WITH_SECRETS
-mod_LTLIBRARIES += libvirt_driver_secret.la
-libvirt_driver_secret_la_CFLAGS = \
-		-I$(srcdir)/access \
-		-I$(srcdir)/conf \
-		$(AM_CFLAGS)
-libvirt_driver_secret_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_secret_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES)
-endif WITH_SECRETS
-
 # Needed to keep automake quiet about conditionals
 libvirt_driver_storage_impl_la_SOURCES =
 libvirt_driver_storage_impl_la_CFLAGS = \
@@ -1433,8 +1408,6 @@ EXTRA_DIST += \
 		$(STORAGE_DRIVER_VSTORAGE_SOURCES) \
 		$(SECURITY_DRIVER_SELINUX_SOURCES) \
 		$(SECURITY_DRIVER_APPARMOR_SOURCES) \
-		$(SECRET_DRIVER_SOURCES) \
-		$(SECRET_UTIL_SOURCES) \
 		$(ACCESS_DRIVER_POLKIT_POLICY)
 
 check-local: check-augeas
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
new file mode 100644
index 0000000000..305c4a1ead
--- /dev/null
+++ b/src/secret/Makefile.inc.am
@@ -0,0 +1,38 @@
+SECRET_DRIVER_SOURCES = \
+	secret/secret_driver.h \
+	secret/secret_driver.c \
+	$(NULL)
+
+SECRET_UTIL_SOURCES = \
+	secret/secret_util.h \
+	secret/secret_util.c \
+	$(NULL)
+
+
+DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES)
+EXTRA_DIST += \
+	$(SECRET_DRIVER_SOURCES) \
+	$(SECRET_UTIL_SOURCESQ) \
+	$(NULL)
+
+noinst_LTLIBRARIES += libvirt_secret.la
+libvirt_la_BUILT_LIBADD += libvirt_secret.la
+libvirt_secret_la_CFLAGS = $(AM_CFLAGS)
+libvirt_secret_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_secret_la_SOURCES = $(SECRET_UTIL_SOURCES)
+
+if WITH_SECRETS
+mod_LTLIBRARIES += libvirt_driver_secret.la
+libvirt_driver_secret_la_CFLAGS = \
+	-I$(srcdir)/access \
+	-I$(srcdir)/conf \
+	$(AM_CFLAGS) \
+	$(NULL)
+libvirt_driver_secret_la_LIBADD = \
+	libvirt.la \
+	../gnulib/lib/libgnu.la \
+	$(NULL)
+libvirt_driver_secret_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES)
+endif WITH_SECRETS
-- 
2.14.3