[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/14] Substitute ifdef CONFIG_FOO by obj-
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 12/14] Substitute ifdef CONFIG_FOO by obj- |
Date: |
Thu, 25 Jun 2009 00:08:10 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index f1884d7..eb3f93d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -135,9 +135,7 @@ all: $(PROGS)
#########################################################
# cpu emulator library
libobj-y = exec.o translate-all.o cpu-exec.o translate.o host-utils.o
-ifdef CONFIG_KQEMU
-libobj-y += kqemu.o
-endif
+libobj-$(CONFIG_KQEMU) += kqemu.o
# TCG code generator
libobj-y += tcg/tcg.o tcg/tcg-runtime.o
CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
@@ -176,9 +174,7 @@ endif
ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64)
USE_I386_DIS=y
endif
-ifdef USE_I386_DIS
-libobj-y += i386-dis.o
-endif
+libobj-$(USE_I386_DIS) += i386-dis.o
ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha)
libobj-y += alpha-dis.o
endif
@@ -328,13 +324,12 @@ obj-y = main.o syscall.o strace.o mmap.o signal.o path.o
thunk.o \
elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o
LIBS+= $(PTHREADLIBS)
LIBS+= $(CLOCKLIBS)
-ifdef TARGET_HAS_BFLT
-obj-y += flatload.o
-endif
+obj-$(TARGET_HAS_BFLT) += flatload.o
+
ifdef TARGET_HAS_ELFLOAD32
-obj-y += elfload32.o
elfload32.o: elfload.c
endif
+obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o
ifeq ($(TARGET_ARCH), i386)
obj-y += vm86.o
@@ -498,9 +493,7 @@ obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o
machine.o \
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
-ifdef CONFIG_KVM
-obj-y += kvm.o kvm-all.o
-endif
+obj-$(CONFIG_KVM) += kvm.o kvm-all.o
LIBS+=-lz
ifdef CONFIG_ALSA
@@ -549,9 +542,8 @@ LIBS += $(CONFIG_BLUEZ_LIBS)
endif
# xen backend driver support
-XEN_OBJS := xen_machine_pv.o xen_domainbuild.o
+obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
ifeq ($(CONFIG_XEN), yes)
- obj-y += $(XEN_OBJS)
LIBS += $(XEN_LIBS)
endif
@@ -599,9 +591,7 @@ ifdef FDT_LIBS
obj-y += device_tree.o
LIBS+= $(FDT_LIBS)
endif
-ifdef CONFIG_KVM
-obj-y += kvm_ppc.o
-endif
+obj-$(CONFIG_KVM) += kvm_ppc.o
endif
ifeq ($(TARGET_BASE_ARCH), mips)
obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
--
1.6.2.2
- [Qemu-devel] [PATCH 04/14] Rename BLOCK_OBJS to block-obj-y, (continued)
- [Qemu-devel] [PATCH 04/14] Rename BLOCK_OBJS to block-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 05/14] Rename AUDIO_OBJS to audio-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 06/14] Rename SLIRP_OBJS to slirp-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 07/14] Rename XEN_OBJS to xen-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 08/14] Rename USER_OBJS to user-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 09/14] Rename OBJS to obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 11/14] Substitute ifdef CONFIG_FOO by obj-, quintela, 2009/06/24
- [Qemu-devel] [PATCH 10/14] move CONFIG_* values from yes to y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 12/14] Substitute ifdef CONFIG_FOO by obj-,
quintela <=
- [Qemu-devel] [PATCH 13/14] Rename SOUND_HW to sound-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 14/14] Substitute ifdef CONFIG_FOO by sound-obj-, quintela, 2009/06/24