qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 07/24] move other target-*/ objects to nested Makefi


From: Paolo Bonzini
Subject: [Qemu-devel] [PATCH 07/24] move other target-*/ objects to nested Makefiles
Date: Sun, 3 Jun 2012 14:25:41 +0200

Signed-off-by: Paolo Bonzini <address@hidden>
---
 Makefile.target            |    6 +++---
 target-alpha/Makefile      |    3 ++-
 target-arm/Makefile        |    3 ++-
 target-cris/Makefile       |    4 ++--
 target-i386/Makefile       |    4 +++-
 target-lm32/Makefile       |    3 ++-
 target-m68k/Makefile       |    3 ++-
 target-microblaze/Makefile |    4 ++--
 target-mips/Makefile       |    3 ++-
 target-ppc/Makefile        |    4 +++-
 target-s390x/Makefile      |    4 +++-
 target-sh4/Makefile        |    3 ++-
 target-sparc/Makefile      |    3 ++-
 target-unicore32/Makefile  |    3 ++-
 target-xtensa/Makefile     |    3 ++-
 15 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index f323ed2..ce9296d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -76,7 +76,7 @@ all: $(PROGS) stap
 
 #########################################################
 # cpu emulator library
-obj-y = exec.o translate-all.o cpu-exec.o translate.o
+obj-y = exec.o translate-all.o cpu-exec.o
 obj-y += tcg/tcg.o tcg/optimize.o
 obj-$(CONFIG_TCG_INTERPRETER) += tci.o
 obj-y += fpu/softfloat.o
@@ -132,7 +132,7 @@ endif #CONFIG_BSD_USER
 # System emulator target
 ifdef CONFIG_SOFTMMU
 
-obj-y += arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o ioport.o
+obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
 obj-$(CONFIG_NO_PCI) += pci-stub.o
@@ -141,7 +141,7 @@ obj-$(CONFIG_VIRTIO) += virtio-scsi.o
 obj-y += vhost_net.o
 obj-$(CONFIG_VHOST_NET) += vhost.o
 obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o
-obj-$(CONFIG_KVM) += kvm.o kvm-all.o
+obj-$(CONFIG_KVM) += kvm-all.o
 obj-$(CONFIG_NO_KVM) += kvm-stub.o
 obj-$(CONFIG_VGA) += vga.o
 obj-y += memory.o savevm.o cputlb.o
diff --git a/target-alpha/Makefile b/target-alpha/Makefile
index 9a72870..590304c 100644
--- a/target-alpha/Makefile
+++ b/target-alpha/Makefile
@@ -1,2 +1,3 @@
-obj-y += helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o helper.o cpu.o
 obj-y += int_helper.o fpu_helper.o sys_helper.o mem_helper.o
diff --git a/target-arm/Makefile b/target-arm/Makefile
index 64b7830..b6f1a9e 100644
--- a/target-arm/Makefile
+++ b/target-arm/Makefile
@@ -1,3 +1,4 @@
 obj-y += arm-semi.o
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
 obj-y += neon_helper.o iwmmxt_helper.o
diff --git a/target-cris/Makefile b/target-cris/Makefile
index 8fc92b4..afb87bc 100644
--- a/target-cris/Makefile
+++ b/target-cris/Makefile
@@ -1,2 +1,2 @@
-obj-y += op_helper.o helper.o cpu.o
-obj-$(CONFIG_SOFTMMU) += mmu.o
+obj-y += translate.o op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += mmu.o machine.o
diff --git a/target-i386/Makefile b/target-i386/Makefile
index c64b207..2bfa156 100644
--- a/target-i386/Makefile
+++ b/target-i386/Makefile
@@ -1,4 +1,6 @@
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
 obj-$(CONFIG_KVM) += hyperv.o
 obj-$(CONFIG_LINUX_USER) += ioport-user.o
 obj-$(CONFIG_BSD_USER) += ioport-user.o
+obj-$(CONFIG_KVM) += kvm.o
diff --git a/target-lm32/Makefile b/target-lm32/Makefile
index 15826d1..dd9d914 100644
--- a/target-lm32/Makefile
+++ b/target-lm32/Makefile
@@ -1 +1,2 @@
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
diff --git a/target-m68k/Makefile b/target-m68k/Makefile
index e43774f..265a78f 100644
--- a/target-m68k/Makefile
+++ b/target-m68k/Makefile
@@ -1,2 +1,3 @@
 obj-y += m68k-semi.o
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
diff --git a/target-microblaze/Makefile b/target-microblaze/Makefile
index 8fc92b4..95ca018 100644
--- a/target-microblaze/Makefile
+++ b/target-microblaze/Makefile
@@ -1,2 +1,2 @@
-obj-y += op_helper.o helper.o cpu.o
-obj-$(CONFIG_SOFTMMU) += mmu.o
+obj-$(CONFIG_SOFTMMU) += mmu.o machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
diff --git a/target-mips/Makefile b/target-mips/Makefile
index 15826d1..dd9d914 100644
--- a/target-mips/Makefile
+++ b/target-mips/Makefile
@@ -1 +1,2 @@
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
diff --git a/target-ppc/Makefile b/target-ppc/Makefile
index 8413532..2c32f9c 100644
--- a/target-ppc/Makefile
+++ b/target-ppc/Makefile
@@ -1 +1,3 @@
-obj-y += op_helper.o helper.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o
+obj-$(CONFIG_KVM) += kvm.o
diff --git a/target-s390x/Makefile b/target-s390x/Makefile
index 15826d1..a597327 100644
--- a/target-s390x/Makefile
+++ b/target-s390x/Makefile
@@ -1 +1,3 @@
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
+obj-$(CONFIG_KVM) += kvm.o
diff --git a/target-sh4/Makefile b/target-sh4/Makefile
index 15826d1..dd9d914 100644
--- a/target-sh4/Makefile
+++ b/target-sh4/Makefile
@@ -1 +1,2 @@
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
diff --git a/target-sparc/Makefile b/target-sparc/Makefile
index 4bd1a4c..9fc42ea 100644
--- a/target-sparc/Makefile
+++ b/target-sparc/Makefile
@@ -1,4 +1,5 @@
-obj-y += helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o helper.o cpu.o
 obj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
 obj-$(TARGET_SPARC) += int32_helper.o
 obj-$(TARGET_SPARC64) += int64_helper.o
diff --git a/target-unicore32/Makefile b/target-unicore32/Makefile
index 15826d1..dd9d914 100644
--- a/target-unicore32/Makefile
+++ b/target-unicore32/Makefile
@@ -1 +1,2 @@
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
diff --git a/target-xtensa/Makefile b/target-xtensa/Makefile
index 7644065..292c6d2 100644
--- a/target-xtensa/Makefile
+++ b/target-xtensa/Makefile
@@ -2,4 +2,5 @@ obj-y += xtensa-semi.o
 obj-y += core-dc232b.o
 obj-y += core-dc233c.o
 obj-y += core-fsf.o
-obj-y += op_helper.o helper.o cpu.o
+obj-$(CONFIG_SOFTMMU) += machine.o
+obj-y += translate.o op_helper.o helper.o cpu.o
-- 
1.7.10.1





reply via email to

[Prev in Thread] Current Thread [Next in Thread]