[libvirt] [PATCH 09/17] make: split CPU build rules into cpu/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 15 +--------------
src/cpu/Makefile.inc.am | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+), 14 deletions(-)
create mode 100644 src/cpu/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index f4fb9ac242..8f628d2d38 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,6 +92,7 @@ sbin_PROGRAMS =
man8_MANS =
include conf/Makefile.inc.am
+include cpu/Makefile.inc.am
include uml/Makefile.inc.am
include phyp/Makefile.inc.am
include test/Makefile.inc.am
@@ -692,14 +693,6 @@ ACCESS_DRIVER_POLKIT_POLICY = \
$(srcdir)/access/org.libvirt.api.policy
-CPU_SOURCES = \
- cpu/cpu.h cpu/cpu.c \
- cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \
- cpu/cpu_s390.h cpu/cpu_s390.c \
- cpu/cpu_arm.h cpu/cpu_arm.c \
- cpu/cpu_ppc64.h cpu/cpu_ppc64.c \
- cpu/cpu_ppc64_data.h \
- cpu/cpu_map.h cpu/cpu_map.c
VMX_SOURCES = \
vmx/vmx.c vmx/vmx.h
@@ -731,12 +724,6 @@ libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \
$(POLKIT_LIBS) $(GNUTLS_LIBS)
-noinst_LTLIBRARIES += libvirt_cpu.la
-libvirt_la_BUILT_LIBADD += libvirt_cpu.la
-libvirt_cpu_la_CFLAGS = \
- -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_cpu_la_SOURCES = $(CPU_SOURCES)
-
if WITH_VMX
noinst_LTLIBRARIES += libvirt_vmx.la
libvirt_la_BUILT_LIBADD += libvirt_vmx.la
diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am
new file mode 100644
index 0000000000..5020d40583
--- /dev/null
+++ b/src/cpu/Makefile.inc.am
@@ -0,0 +1,24 @@
+CPU_SOURCES = \
+ cpu/cpu.h \
+ cpu/cpu.c \
+ cpu/cpu_x86.h \
+ cpu/cpu_x86.c \
+ cpu/cpu_x86_data.h \
+ cpu/cpu_s390.h \
+ cpu/cpu_s390.c \
+ cpu/cpu_arm.h \
+ cpu/cpu_arm.c \
+ cpu/cpu_ppc64.h \
+ cpu/cpu_ppc64.c \
+ cpu/cpu_ppc64_data.h \
+ cpu/cpu_map.h \
+ cpu/cpu_map.c \
+ $(NULL)
+
+noinst_LTLIBRARIES += libvirt_cpu.la
+libvirt_la_BUILT_LIBADD += libvirt_cpu.la
+libvirt_cpu_la_CFLAGS = \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_cpu_la_SOURCES = $(CPU_SOURCES)
--
2.14.3