Refactor Makefile object selection
cover Refactor Makefile object selection
From: Juan Quintela <[email protected]>
Hi
Following Anthony suggestion, I changed Makefile* and confiure to:
a- s/OBJS/obj-y/
b- changed configure to generate CONFIG_FOO=y instead of CONFIG_FOO=yes c- Switch all occurences of
ifdef CONFIG_FOO
obj-y += foo.o
endif
to
obj-$(CONFIG_FOO) += foo.oIf people agree on this approach, I will rebase my previous series on top of this one.
If you preffer to pull, you can get it:
git://git.et.redhat.com/qemu-quintela new_selection
Later, Juan.
Juan Quintela (14):
Rename OBJS to obj-y
Rename LIBOBJS to libobj-y
Rename OBJS to obj-y
Rename BLOCK_OBJS to block-obj-y
Rename AUDIO_OBJS to audio-obj-y
Rename SLIRP_OBJS to slirp-obj-y
Rename XEN_OBJS to xen-obj-y
Rename USER_OBJS to user-obj-y
Rename OBJS to obj-y
move CONFIG_* values from yes to y
Substitute ifdef CONFIG_FOO by obj-
Substitute ifdef CONFIG_FOO by obj-
Rename SOUND_HW to sound-obj-y
Substitute ifdef CONFIG_FOO by sound-obj-
Makefile | 164 ++++++++++++++------------------- Makefile.hw | 18 ++-- Makefile.target | 281 ++++++++++++++++++++++++++---------------------------- configure | 74 +++++++------- 4 files changed, 250 insertions(+), 287 deletions(-)
PATCH 1/14 Rename OBJS to obj-y
From: Juan Quintela <[email protected]>
--- Makefile.hw | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
Makefile.hw +9 -9
@@ -15,24 +15,24 @@ CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@ CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE CPPFLAGS+=-I$(SRC_PATH)/fpu -OBJS= -OBJS+= virtio.o virtio-pci.o -OBJS+= fw_cfg.o -OBJS+= watchdog.o -OBJS+= nand.o ecc.o +obj-y = +obj-y += virtio.o virtio-pci.o +obj-y += fw_cfg.o +obj-y += watchdog.o +obj-y += nand.o ecc.o -OBJS+= m48t59.o escc.o +obj-y += m48t59.o escc.o # SCSI layer -OBJS+= lsi53c895a.o esp.o +obj-y += lsi53c895a.o esp.o -OBJS+= dma-helpers.o sysbus.o +obj-y += dma-helpers.o sysbus.o all: $(HWLIB) # Dummy command so that make thinks it has done something @true -$(HWLIB): $(OBJS) +$(HWLIB): $(obj-y) clean: rm -f *.o *.d *.a *~
Signature · 1 line
1.6.2.2
PATCH 2/14 Rename LIBOBJS to libobj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile.target | 49 ++++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 25 deletions(-)
Makefile.target +24 -25
@@ -134,43 +134,42 @@ all: $(PROGS) ######################################################### # cpu emulator library -LIBOBJS=exec.o translate-all.o cpu-exec.o\ - translate.o host-utils.o +libobj-y = exec.o translate-all.o cpu-exec.o translate.o host-utils.o ifdef CONFIG_KQEMU -LIBOBJS+= kqemu.o +libobj-y += kqemu.o endif # TCG code generator -LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o +libobj-y += tcg/tcg.o tcg/tcg-runtime.o CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH) ifeq ($(ARCH),sparc64) CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc endif ifdef CONFIG_SOFTFLOAT -LIBOBJS+=fpu/softfloat.o +libobj-y += fpu/softfloat.o else -LIBOBJS+=fpu/softfloat-native.o +libobj-y += fpu/softfloat-native.o endif CPPFLAGS+=-I$(SRC_PATH)/fpu -LIBOBJS+= op_helper.o helper.o +libobj-y += op_helper.o helper.o ifeq ($(TARGET_BASE_ARCH), arm) -LIBOBJS+= neon_helper.o iwmmxt_helper.o +libobj-y += neon_helper.o iwmmxt_helper.o endif ifeq ($(TARGET_BASE_ARCH), alpha) -LIBOBJS+= alpha_palcode.o +libobj-y += alpha_palcode.o endif ifeq ($(TARGET_BASE_ARCH), cris) -LIBOBJS+= cris-dis.o +libobj-y += cris-dis.o ifndef CONFIG_USER_ONLY -LIBOBJS+= mmu.o +libobj-y += mmu.o endif endif # NOTE: the disassembler code is only needed for debugging -LIBOBJS+=disas.o +libobj-y += disas.o ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386) USE_I386_DIS=y endif
@@ -178,45 +177,45 @@ ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64) USE_I386_DIS=y endif ifdef USE_I386_DIS -LIBOBJS+=i386-dis.o +libobj-y += i386-dis.o endif ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha) -LIBOBJS+=alpha-dis.o +libobj-y += alpha-dis.o endif ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc) -LIBOBJS+=ppc-dis.o +libobj-y += ppc-dis.o endif ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) -LIBOBJS+=microblaze-dis.o +libobj-y += microblaze-dis.o ifndef CONFIG_USER_ONLY -LIBOBJS+= mmu.o +libobj-y += mmu.o endif endif ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) -LIBOBJS+=mips-dis.o +libobj-y += mips-dis.o endif ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc) -LIBOBJS+=sparc-dis.o +libobj-y += sparc-dis.o endif ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm) -LIBOBJS+=arm-dis.o +libobj-y += arm-dis.o endif ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k) -LIBOBJS+=m68k-dis.o +libobj-y += m68k-dis.o endif ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4) -LIBOBJS+=sh4-dis.o +libobj-y += sh4-dis.o endif ifeq ($(findstring hppa, $(TARGET_BASE_ARCH) $(ARCH)),hppa) -LIBOBJS+=hppa-dis.o +libobj-y += hppa-dis.o endif ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390) -LIBOBJS+=s390-dis.o +libobj-y += s390-dis.o endif # libqemu -libqemu.a: $(LIBOBJS) +libqemu.a: $(libobj-y) translate.o: translate.c cpu.h
Signature · 1 line
1.6.2.2
PATCH 3/14 Rename OBJS to obj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile.target | 204 +++++++++++++++++++++++++++--------------------------- 1 files changed, 102 insertions(+), 102 deletions(-)
Makefile.target +102 -102
@@ -324,28 +324,28 @@ LDFLAGS+=-p CFLAGS+=-p endif -OBJS= main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \ +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 -OBJS+= flatload.o +obj-y += flatload.o endif ifdef TARGET_HAS_ELFLOAD32 -OBJS+= elfload32.o +obj-y += elfload32.o elfload32.o: elfload.c endif ifeq ($(TARGET_ARCH), i386) -OBJS+= vm86.o +obj-y += vm86.o endif ifeq ($(TARGET_ARCH), arm) -OBJS+=nwfpe/fpa11.o nwfpe/fpa11_cpdo.o \ +obj-y += nwfpe/fpa11.o nwfpe/fpa11_cpdo.o \ nwfpe/fpa11_cpdt.o nwfpe/fpa11_cprt.o nwfpe/fpopcode.o nwfpe/single_cpdo.o \ nwfpe/double_cpdo.o nwfpe/extended_cpdo.o arm-semi.o endif ifeq ($(TARGET_ARCH), m68k) -OBJS+= m68k-sim.o m68k-semi.o +obj-y += m68k-sim.o m68k-semi.o endif # Note: this is a workaround. The real fix is to avoid compiling
@@ -353,8 +353,8 @@ endif signal.o: CFLAGS += $(HELPER_CFLAGS) $(QEMU_PROG): ARLIBS=../libqemu_user.a libqemu.a -$(QEMU_PROG): $(OBJS) ../libqemu_user.a libqemu.a - $(call LINK,$(OBJS)) +$(QEMU_PROG): $(obj-y) ../libqemu_user.a libqemu.a + $(call LINK,$(obj-y)) ifeq ($(ARCH),alpha) # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of # the address space (31 bit so sign extending doesn't matter)
@@ -376,16 +376,16 @@ LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000 LIBS+=-lmx -OBJS= main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \ - gdbstub.o gdbstub-xml.o +obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \ + gdbstub.o gdbstub-xml.o # Note: this is a workaround. The real fix is to avoid compiling # cpu_signal_handler() in cpu-exec.c. signal.o: CFLAGS += $(HELPER_CFLAGS) $(QEMU_PROG): ARLIBS=libqemu.a -$(QEMU_PROG): $(OBJS) libqemu.a - $(call LINK,$(OBJS)) +$(QEMU_PROG): $(obj-y) libqemu.a + $(call LINK,$(obj-y)) endif #CONFIG_DARWIN_USER
@@ -475,17 +475,17 @@ LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld endif endif -OBJS= main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \ - gdbstub.o gdbstub-xml.o -OBJS+= uaccess.o +obj-y = main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \ + gdbstub.o gdbstub-xml.o +obj-y += uaccess.o # Note: this is a workaround. The real fix is to avoid compiling # cpu_signal_handler() in cpu-exec.c. signal.o: CFLAGS += $(HELPER_CFLAGS) $(QEMU_PROG): ARLIBS=libqemu.a ../libqemu_user.a -$(QEMU_PROG): $(OBJS) libqemu.a ../libqemu_user.a - $(call LINK,$(OBJS)) +$(QEMU_PROG): $(obj-y) libqemu.a ../libqemu_user.a + $(call LINK,$(obj-y)) endif #CONFIG_BSD_USER
@@ -493,13 +493,13 @@ endif #CONFIG_BSD_USER # System emulator target ifndef CONFIG_USER_ONLY -OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \ - gdbstub.o gdbstub-xml.o +obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \ + gdbstub.o gdbstub-xml.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly -OBJS+=virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o ifdef CONFIG_KVM -OBJS+=kvm.o kvm-all.o +obj-y += kvm.o kvm-all.o endif LIBS+=-lz
@@ -551,140 +551,140 @@ endif # xen backend driver support XEN_OBJS := xen_machine_pv.o xen_domainbuild.o ifeq ($(CONFIG_XEN), yes) - OBJS += $(XEN_OBJS) + obj-y += $(XEN_OBJS) LIBS += $(XEN_LIBS) endif # USB layer -OBJS+= usb-ohci.o +obj-y += usb-ohci.o # PCI network cards -OBJS += eepro100.o -OBJS += ne2000.o -OBJS += pcnet.o -OBJS += rtl8139.o -OBJS += e1000.o +obj-y += eepro100.o +obj-y += ne2000.o +obj-y += pcnet.o +obj-y += rtl8139.o +obj-y += e1000.o # Generic watchdog support and some watchdog devices -OBJS += wdt_ib700.o wdt_i6300esb.o +obj-y += wdt_ib700.o wdt_i6300esb.o ifeq ($(TARGET_BASE_ARCH), i386) # Hardware support -OBJS+= ide.o pckbd.o vga.o $(SOUND_HW) dma.o -OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o -OBJS+= cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o -OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o -OBJS += device-hotplug.o pci-hotplug.o smbios.o +obj-y += ide.o pckbd.o vga.o $(SOUND_HW) dma.o +obj-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o +obj-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o +obj-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o +obj-y += device-hotplug.o pci-hotplug.o smbios.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif ifeq ($(TARGET_BASE_ARCH), ppc) CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE # shared objects -OBJS+= ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o +obj-y += ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o # PREP target -OBJS+= pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o -OBJS+= prep_pci.o ppc_prep.o +obj-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o +obj-y += prep_pci.o ppc_prep.o # Mac shared devices -OBJS+= macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o +obj-y += macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o # OldWorld PowerMac -OBJS+= heathrow_pic.o grackle_pci.o ppc_oldworld.o +obj-y += heathrow_pic.o grackle_pci.o ppc_oldworld.o # NewWorld PowerMac -OBJS+= unin_pci.o ppc_newworld.o +obj-y += unin_pci.o ppc_newworld.o # PowerPC 4xx boards -OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o -OBJS+= ppc440.o ppc440_bamboo.o +obj-y += pflash_cfi02.o ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o +obj-y += ppc440.o ppc440_bamboo.o # PowerPC E500 boards -OBJS+= ppce500_pci.o ppce500_mpc8544ds.o +obj-y += ppce500_pci.o ppce500_mpc8544ds.o ifdef FDT_LIBS -OBJS+= device_tree.o +obj-y += device_tree.o LIBS+= $(FDT_LIBS) endif ifdef CONFIG_KVM -OBJS+= kvm_ppc.o +obj-y += kvm_ppc.o endif endif ifeq ($(TARGET_BASE_ARCH), mips) -OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o -OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o -OBJS+= g364fb.o jazz_led.o dp8393x.o -OBJS+= ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o -OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW) -OBJS+= mipsnet.o -OBJS+= pflash_cfi01.o -OBJS+= vmware_vga.o +obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o +obj-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o +obj-y += g364fb.o jazz_led.o dp8393x.o +obj-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o +obj-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW) +obj-y += mipsnet.o +obj-y += pflash_cfi01.o +obj-y += vmware_vga.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif ifeq ($(TARGET_BASE_ARCH), microblaze) -OBJS+= petalogix_s3adsp1800_mmu.o +obj-y += petalogix_s3adsp1800_mmu.o -OBJS+= microblaze_pic_cpu.o -OBJS+= xilinx_intc.o -OBJS+= xilinx_timer.o -OBJS+= xilinx_uartlite.o -OBJS+= xilinx_ethlite.o +obj-y += microblaze_pic_cpu.o +obj-y += xilinx_intc.o +obj-y += xilinx_timer.o +obj-y += xilinx_uartlite.o +obj-y += xilinx_ethlite.o -OBJS+= pflash_cfi02.o +obj-y += pflash_cfi02.o ifdef FDT_LIBS -OBJS+= device_tree.o +obj-y += device_tree.o LIBS+= $(FDT_LIBS) endif endif ifeq ($(TARGET_BASE_ARCH), cris) # Boards -OBJS+= cris_pic_cpu.o etraxfs.o axis_dev88.o +obj-y += cris_pic_cpu.o etraxfs.o axis_dev88.o # IO blocks -OBJS+= etraxfs_dma.o -OBJS+= etraxfs_pic.o -OBJS+= etraxfs_eth.o -OBJS+= etraxfs_timer.o -OBJS+= etraxfs_ser.o +obj-y += etraxfs_dma.o +obj-y += etraxfs_pic.o +obj-y += etraxfs_eth.o +obj-y += etraxfs_timer.o +obj-y += etraxfs_ser.o -OBJS+= pflash_cfi02.o +obj-y += pflash_cfi02.o endif ifeq ($(TARGET_BASE_ARCH), sparc) ifeq ($(TARGET_ARCH), sparc64) -OBJS+= sun4u.o ide.o pckbd.o vga.o apb_pci.o -OBJS+= fdc.o mc146818rtc.o serial.o -OBJS+= cirrus_vga.o parallel.o +obj-y += sun4u.o ide.o pckbd.o vga.o apb_pci.o +obj-y += fdc.o mc146818rtc.o serial.o +obj-y += cirrus_vga.o parallel.o else -OBJS+= sun4m.o tcx.o iommu.o slavio_intctl.o -OBJS+= slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o -OBJS+= cs4231.o eccmemctl.o sbi.o sun4c_intctl.o +obj-y += sun4m.o tcx.o iommu.o slavio_intctl.o +obj-y += slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o +obj-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o endif endif ifeq ($(TARGET_BASE_ARCH), arm) -OBJS+= integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o -OBJS+= arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o -OBJS+= versatile_pci.o -OBJS+= realview_gic.o realview.o arm_sysctl.o mpcore.o -OBJS+= armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o -OBJS+= pl061.o -OBJS+= arm-semi.o -OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o -OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o -OBJS+= pflash_cfi01.o gumstix.o -OBJS+= zaurus.o ide.o serial.o spitz.o tosa.o tc6393xb.o -OBJS+= omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o -OBJS+= omap2.o omap_dss.o soc_dma.o -OBJS+= omap_sx1.o palm.o tsc210x.o -OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o -OBJS+= mst_fpga.o mainstone.o -OBJS+= musicpal.o pflash_cfi02.o -OBJS+= framebuffer.o -OBJS+= syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o -OBJS+= syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o -OBJS+= syborg_virtio.o +obj-y += integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o +obj-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o +obj-y += versatile_pci.o +obj-y += realview_gic.o realview.o arm_sysctl.o mpcore.o +obj-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o +obj-y += pl061.o +obj-y += arm-semi.o +obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o +obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o +obj-y += pflash_cfi01.o gumstix.o +obj-y += zaurus.o ide.o serial.o spitz.o tosa.o tc6393xb.o +obj-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o +obj-y += omap2.o omap_dss.o soc_dma.o +obj-y += omap_sx1.o palm.o tsc210x.o +obj-y += nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o +obj-y += mst_fpga.o mainstone.o +obj-y += musicpal.o pflash_cfi02.o +obj-y += framebuffer.o +obj-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o +obj-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o +obj-y += syborg_virtio.o CPPFLAGS += -DHAS_AUDIO endif ifeq ($(TARGET_BASE_ARCH), sh4) -OBJS+= shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o -OBJS+= sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o -OBJS+= ide.o +obj-y += shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o +obj-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o +obj-y += ide.o endif ifeq ($(TARGET_BASE_ARCH), m68k) -OBJS+= an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o -OBJS+= m68k-semi.o dummy_m68k.o +obj-y += an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o +obj-y += m68k-semi.o dummy_m68k.o endif ifdef CONFIG_COCOA COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
@@ -738,8 +738,8 @@ monitor.o: qemu-monitor.h $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS) $(QEMU_PROG): ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) -$(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(HWLIB) - $(call LINK,$(OBJS)) +$(QEMU_PROG): $(obj-y) ../libqemu_common.a libqemu.a $(HWLIB) + $(call LINK,$(obj-y)) endif # !CONFIG_USER_ONLY
Signature · 1 line
1.6.2.2
PATCH 4/14 Rename BLOCK_OBJS to block-obj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
Makefile +16 -16
@@ -64,27 +64,27 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a recurse-all: $(SUBDIR_RULES) ####################################################################### -# BLOCK_OBJS is code used by both qemu system emulation and qemu-img +# block-obj-y is code used by both qemu system emulation and qemu-img -BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o -BLOCK_OBJS+=block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o -BLOCK_OBJS+=block/dmg.o block/bochs.o block/vpc.o block/vvfat.o -BLOCK_OBJS+=block/qcow2.o block/qcow2-refcount.o block/qcow2-cluster.o -BLOCK_OBJS+=block/qcow2-snapshot.o -BLOCK_OBJS+=block/parallels.o block/nbd.o -BLOCK_OBJS+=nbd.o block.o aio.o +block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o +block-obj-y += block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o +block-obj-y += block/dmg.o block/bochs.o block/vpc.o block/vvfat.o +block-obj-y += block/qcow2.o block/qcow2-refcount.o block/qcow2-cluster.o +block-obj-y += block/qcow2-snapshot.o +block-obj-y += block/parallels.o block/nbd.o +block-obj-y += nbd.o block.o aio.o ifdef CONFIG_WIN32 -BLOCK_OBJS += block/raw-win32.o +block-obj-y += block/raw-win32.o else ifdef CONFIG_AIO -BLOCK_OBJS += posix-aio-compat.o +block-obj-y += posix-aio-compat.o endif -BLOCK_OBJS += block/raw-posix.o +block-obj-y += block/raw-posix.o endif ifdef CONFIG_CURL -BLOCK_OBJS += block/curl.o +block-obj-y += block/curl.o endif ######################################################################
@@ -93,7 +93,7 @@ endif # system emulation, i.e. a single QEMU executable should support all # CPUs and machines. -OBJS=$(BLOCK_OBJS) +OBJS=$(block-obj-y) OBJS+=readline.o console.o OBJS+=irq.o ptimer.o
@@ -243,11 +243,11 @@ libqemu_user.a: $(USER_OBJS) qemu-img.o: qemu-img-cmds.h -qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(block-obj-y) -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(block-obj-y) -qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(BLOCK_OBJS) +qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(block-obj-y) qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz
Signature · 1 line
1.6.2.2
PATCH 5/14 Rename AUDIO_OBJS to audio-obj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
Makefile +12 -12
@@ -123,45 +123,45 @@ else OBJS+=migration-exec.o endif -AUDIO_OBJS = audio.o noaudio.o wavaudio.o mixeng.o +audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o ifdef CONFIG_SDL -AUDIO_OBJS += sdlaudio.o +audio-obj-y += sdlaudio.o endif ifdef CONFIG_OSS -AUDIO_OBJS += ossaudio.o +audio-obj-y += ossaudio.o endif ifdef CONFIG_COREAUDIO -AUDIO_OBJS += coreaudio.o +audio-obj-y += coreaudio.o AUDIO_PT = yes endif ifdef CONFIG_ALSA -AUDIO_OBJS += alsaaudio.o +audio-obj-y += alsaaudio.o endif ifdef CONFIG_DSOUND -AUDIO_OBJS += dsoundaudio.o +audio-obj-y += dsoundaudio.o endif ifdef CONFIG_FMOD -AUDIO_OBJS += fmodaudio.o +audio-obj-y += fmodaudio.o audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS) endif ifdef CONFIG_ESD AUDIO_PT = yes AUDIO_PT_INT = yes -AUDIO_OBJS += esdaudio.o +audio-obj-y += esdaudio.o endif ifdef CONFIG_PA AUDIO_PT = yes AUDIO_PT_INT = yes -AUDIO_OBJS += paaudio.o +audio-obj-y += paaudio.o endif ifdef AUDIO_PT LDFLAGS += -pthread endif ifdef AUDIO_PT_INT -AUDIO_OBJS += audio_pt_int.o +audio-obj-y += audio_pt_int.o endif -AUDIO_OBJS+= wavcapture.o -OBJS+=$(addprefix audio/, $(AUDIO_OBJS)) +audio-obj-y += wavcapture.o +OBJS+=$(addprefix audio/, $(audio-obj-y)) OBJS+=keymaps.o ifdef CONFIG_SDL
Signature · 1 line
1.6.2.2
PATCH 6/14 Rename SLIRP_OBJS to slirp-obj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
Makefile +4 -4
@@ -188,10 +188,10 @@ endif ifdef CONFIG_SLIRP CPPFLAGS+=-I$(SRC_PATH)/slirp -SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \ -slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o \ -tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o -OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) +slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o +slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o +slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o +OBJS+=$(addprefix slirp/, $(slirp-obj-y)) endif LIBS+=$(VDE_LIBS)
Signature · 1 line
1.6.2.2
PATCH 7/14 Rename XEN_OBJS to xen-obj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
Makefile +3 -3
@@ -197,10 +197,10 @@ endif LIBS+=$(VDE_LIBS) # xen backend driver support -XEN_OBJS := xen_backend.o xen_devconfig.o -XEN_OBJS += xen_console.o xenfb.o xen_disk.o xen_nic.o +xen-obj-y := xen_backend.o xen_devconfig.o +xen-obj-y += xen_console.o xenfb.o xen_disk.o xen_nic.o ifdef CONFIG_XEN - OBJS += $(XEN_OBJS) + OBJS += $(xen-obj-y) endif LIBS+=$(CURL_LIBS)
Signature · 1 line
1.6.2.2
PATCH 8/14 Rename USER_OBJS to user-obj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
Makefile +3 -3
@@ -234,10 +234,10 @@ bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) libqemu_common.a: $(OBJS) ####################################################################### -# USER_OBJS is code used by qemu userspace emulation -USER_OBJS=cutils.o cache-utils.o +# user-obj-y is code used by qemu userspace emulation +user-obj-y = cutils.o cache-utils.o -libqemu_user.a: $(USER_OBJS) +libqemu_user.a: $(user-obj-y) ######################################################################
Signature · 1 line
1.6.2.2
PATCH 9/14 Rename OBJS to obj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile | 66 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 33 insertions(+), 33 deletions(-)
Makefile +33 -33
@@ -93,34 +93,34 @@ endif # system emulation, i.e. a single QEMU executable should support all # CPUs and machines. -OBJS=$(block-obj-y) -OBJS+=readline.o console.o - -OBJS+=irq.o ptimer.o -OBJS+=i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o -OBJS+=ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o -OBJS+=tmp105.o lm832x.o eeprom93xx.o tsc2005.o -OBJS+=scsi-disk.o cdrom.o -OBJS+=scsi-generic.o -OBJS+=usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o -OBJS+=usb-serial.o usb-net.o -OBJS+=sd.o ssi-sd.o -OBJS+=bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o -OBJS+=bt-hci-csr.o -OBJS+=buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o -OBJS+=qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o -OBJS+=msmouse.o ps2.o -OBJS+=qdev.o ssi.o +obj-y = $(block-obj-y) +obj-y += readline.o console.o + +obj-y += irq.o ptimer.o +obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o +obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o +obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o +obj-y += scsi-disk.o cdrom.o +obj-y += scsi-generic.o +obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o +obj-y += usb-serial.o usb-net.o +obj-y += sd.o ssi-sd.o +obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o +obj-y += bt-hci-csr.o +obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o +obj-y += qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o +obj-y += msmouse.o ps2.o +obj-y += qdev.o ssi.o ifdef CONFIG_BRLAPI -OBJS+= baum.o +obj-y += baum.o LIBS+=-lbrlapi endif ifdef CONFIG_WIN32 -OBJS+=tap-win32.o +obj-y += tap-win32.o else -OBJS+=migration-exec.o +obj-y += migration-exec.o endif audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
@@ -161,29 +161,29 @@ ifdef AUDIO_PT_INT audio-obj-y += audio_pt_int.o endif audio-obj-y += wavcapture.o -OBJS+=$(addprefix audio/, $(audio-obj-y)) +obj-y += $(addprefix audio/, $(audio-obj-y)) -OBJS+=keymaps.o +obj-y += keymaps.o ifdef CONFIG_SDL -OBJS+=sdl.o x_keymap.o +obj-y += sdl.o x_keymap.o endif ifdef CONFIG_CURSES -OBJS+=curses.o +obj-y += curses.o endif -OBJS+=vnc.o acl.o d3des.o +obj-y += vnc.o acl.o d3des.o ifdef CONFIG_VNC_TLS -OBJS+=vnc-tls.o vnc-auth-vencrypt.o +obj-y += vnc-tls.o vnc-auth-vencrypt.o endif ifdef CONFIG_VNC_SASL -OBJS+=vnc-auth-sasl.o +obj-y += vnc-auth-sasl.o endif ifdef CONFIG_COCOA -OBJS+=cocoa.o +obj-y += cocoa.o endif ifdef CONFIG_IOTHREAD -OBJS+=qemu-thread.o +obj-y += qemu-thread.o endif ifdef CONFIG_SLIRP
@@ -191,7 +191,7 @@ CPPFLAGS+=-I$(SRC_PATH)/slirp slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o -OBJS+=$(addprefix slirp/, $(slirp-obj-y)) +obj-y += $(addprefix slirp/, $(slirp-obj-y)) endif LIBS+=$(VDE_LIBS)
@@ -200,7 +200,7 @@ LIBS+=$(VDE_LIBS) xen-obj-y := xen_backend.o xen_devconfig.o xen-obj-y += xen_console.o xenfb.o xen_disk.o xen_nic.o ifdef CONFIG_XEN - OBJS += $(xen-obj-y) + obj-y += $(xen-obj-y) endif LIBS+=$(CURL_LIBS)
@@ -231,7 +231,7 @@ curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) -libqemu_common.a: $(OBJS) +libqemu_common.a: $(obj-y) ####################################################################### # user-obj-y is code used by qemu userspace emulation
Signature · 1 line
1.6.2.2
PATCH 10/14 move CONFIG_* values from yes to y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- configure | 74 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 37 insertions(+), 37 deletions(-)
configure +37 -37
@@ -1589,7 +1589,7 @@ if test "$bigendian" = "yes" ; then fi echo "#define HOST_LONG_BITS $hostlongbits" >> $config_h if test "$mingw32" = "yes" ; then - echo "CONFIG_WIN32=yes" >> $config_mak + echo "CONFIG_WIN32=y" >> $config_mak echo "#define CONFIG_WIN32 1" >> $config_h else cat > $TMPC << EOF
@@ -1615,17 +1615,17 @@ if [ "$openbsd" = "yes" ] ; then fi if test "$darwin" = "yes" ; then - echo "CONFIG_DARWIN=yes" >> $config_mak + echo "CONFIG_DARWIN=y" >> $config_mak echo "#define CONFIG_DARWIN 1" >> $config_h fi if test "$aix" = "yes" ; then - echo "CONFIG_AIX=yes" >> $config_mak + echo "CONFIG_AIX=y" >> $config_mak echo "#define CONFIG_AIX 1" >> $config_h fi if test "$solaris" = "yes" ; then - echo "CONFIG_SOLARIS=yes" >> $config_mak + echo "CONFIG_SOLARIS=y" >> $config_mak echo "#define HOST_SOLARIS $solarisrev" >> $config_h if test "$needs_libsunmath" = "yes" ; then echo "NEEDS_LIBSUNMATH=yes" >> $config_mak
@@ -1633,7 +1633,7 @@ if test "$solaris" = "yes" ; then fi fi if test -n "$sparc_cpu"; then - echo "CONFIG__sparc_${sparc_cpu}__=yes" >> $config_mak + echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_mak echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h fi if test "$gprof" = "yes" ; then
@@ -1641,31 +1641,31 @@ if test "$gprof" = "yes" ; then echo "#define HAVE_GPROF 1" >> $config_h fi if test "$static" = "yes" ; then - echo "CONFIG_STATIC=yes" >> $config_mak + echo "CONFIG_STATIC=y" >> $config_mak echo "#define CONFIG_STATIC 1" >> $config_h fi if test $profiler = "yes" ; then echo "#define CONFIG_PROFILER 1" >> $config_h fi if test "$slirp" = "yes" ; then - echo "CONFIG_SLIRP=yes" >> $config_mak + echo "CONFIG_SLIRP=y" >> $config_mak echo "#define CONFIG_SLIRP 1" >> $config_h fi if test "$vde" = "yes" ; then - echo "CONFIG_VDE=yes" >> $config_mak + echo "CONFIG_VDE=y" >> $config_mak echo "#define CONFIG_VDE 1" >> $config_h echo "VDE_LIBS=-lvdeplug" >> $config_mak fi for card in $audio_card_list; do def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'` - echo "$def=yes" >> $config_mak + echo "$def=y" >> $config_mak echo "#define $def 1" >> $config_h done echo "#define AUDIO_DRIVERS \\" >> $config_h for drv in $audio_drv_list; do echo " &${drv}_audio_driver, \\" >>$config_h def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'` - echo "$def=yes" >> $config_mak + echo "$def=y" >> $config_mak if test "$drv" = "fmod"; then echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
@@ -1675,17 +1675,17 @@ for drv in $audio_drv_list; do done echo "" >>$config_h if test "$mixemu" = "yes" ; then - echo "CONFIG_MIXEMU=yes" >> $config_mak + echo "CONFIG_MIXEMU=y" >> $config_mak echo "#define CONFIG_MIXEMU 1" >> $config_h fi if test "$vnc_tls" = "yes" ; then - echo "CONFIG_VNC_TLS=yes" >> $config_mak + echo "CONFIG_VNC_TLS=y" >> $config_mak echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak echo "#define CONFIG_VNC_TLS 1" >> $config_h fi if test "$vnc_sasl" = "yes" ; then - echo "CONFIG_VNC_SASL=yes" >> $config_mak + echo "CONFIG_VNC_SASL=y" >> $config_mak echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak echo "#define CONFIG_VNC_SASL 1" >> $config_h
@@ -1714,7 +1714,7 @@ else fi if test "$sdl1" = "yes" ; then echo "#define CONFIG_SDL 1" >> $config_h - echo "CONFIG_SDL=yes" >> $config_mak + echo "CONFIG_SDL=y" >> $config_mak if test "$target_softmmu" = "no" -o "$static" = "yes"; then echo "SDL_LIBS=$sdl_static_libs" >> $config_mak elif test "$sdl_x11" = "yes" ; then
@@ -1730,11 +1730,11 @@ if test "$sdl1" = "yes" ; then fi if test "$cocoa" = "yes" ; then echo "#define CONFIG_COCOA 1" >> $config_h - echo "CONFIG_COCOA=yes" >> $config_mak + echo "CONFIG_COCOA=y" >> $config_mak fi if test "$curses" = "yes" ; then echo "#define CONFIG_CURSES 1" >> $config_h - echo "CONFIG_CURSES=yes" >> $config_mak + echo "CONFIG_CURSES=y" >> $config_mak echo "CURSES_LIBS=-lcurses" >> $config_mak fi if test "$atfile" = "yes" ; then
@@ -1753,17 +1753,17 @@ if test "$inotify" = "yes" ; then echo "#define CONFIG_INOTIFY 1" >> $config_h fi if test "$curl" = "yes" ; then - echo "CONFIG_CURL=yes" >> $config_mak + echo "CONFIG_CURL=y" >> $config_mak echo "CURL_LIBS=$curl_libs" >> $config_mak echo "#define CONFIG_CURL 1" >> $config_h fi if test "$brlapi" = "yes" ; then - echo "CONFIG_BRLAPI=yes" >> $config_mak + echo "CONFIG_BRLAPI=y" >> $config_mak echo "#define CONFIG_BRLAPI 1" >> $config_h echo "BRLAPI_LIBS=-lbrlapi" >> $config_mak fi if test "$bluez" = "yes" ; then - echo "CONFIG_BLUEZ=yes" >> $config_mak + echo "CONFIG_BLUEZ=y" >> $config_mak echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_mak echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_mak echo "#define CONFIG_BLUEZ 1" >> $config_h
@@ -1773,10 +1773,10 @@ if test "$xen" = "yes" ; then fi if test "$aio" = "yes" ; then echo "#define CONFIG_AIO 1" >> $config_h - echo "CONFIG_AIO=yes" >> $config_mak + echo "CONFIG_AIO=y" >> $config_mak fi if test "$io_thread" = "yes" ; then - echo "CONFIG_IOTHREAD=yes" >> $config_mak + echo "CONFIG_IOTHREAD=y" >> $config_mak echo "#define CONFIG_IOTHREAD 1" >> $config_h fi if test "$blobs" = "yes" ; then
@@ -1848,7 +1848,7 @@ fi if test "$xen" = "yes" ; then - echo "CONFIG_XEN=yes" >> $config_mak + echo "CONFIG_XEN=y" >> $config_mak fi tools=
@@ -1969,17 +1969,17 @@ case "$target_cpu" in echo "#define TARGET_I386 1" >> $config_h if test $kqemu = "yes" -a "$target_softmmu" = "yes" then - echo "CONFIG_KQEMU=yes" >> $config_mak + echo "CONFIG_KQEMU=y" >> $config_mak echo "#define CONFIG_KQEMU 1" >> $config_h fi if test "$target_kvm" = "yes" ; then - echo "CONFIG_KVM=yes" >> $config_mak + echo "CONFIG_KVM=y" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "#define CONFIG_KVM 1" >> $config_h fi if test "$xen" = "yes" -a "$target_softmmu" = "yes"; then - echo "CONFIG_XEN=yes" >> $config_mak + echo "CONFIG_XEN=y" >> $config_mak echo "#define CONFIG_XEN 1" >> $config_h fi target_phys_bits=32
@@ -1991,17 +1991,17 @@ case "$target_cpu" in echo "#define TARGET_X86_64 1" >> $config_h if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" then - echo "CONFIG_KQEMU=yes" >> $config_mak + echo "CONFIG_KQEMU=y" >> $config_mak echo "#define CONFIG_KQEMU 1" >> $config_h fi if test "$target_kvm" = "yes" ; then - echo "CONFIG_KVM=yes" >> $config_mak + echo "CONFIG_KVM=y" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "#define CONFIG_KVM 1" >> $config_h fi if test "$xen" = "yes" -a "$target_softmmu" = "yes" then - echo "CONFIG_XEN=yes" >> $config_mak + echo "CONFIG_XEN=y" >> $config_mak echo "#define CONFIG_XEN 1" >> $config_h fi target_phys_bits=64
@@ -2080,7 +2080,7 @@ case "$target_cpu" in echo "#define TARGET_PPC 1" >> $config_h echo "#define TARGET_PPCEMB 1" >> $config_h if test "$target_kvm" = "yes" ; then - echo "CONFIG_KVM=yes" >> $config_mak + echo "CONFIG_KVM=y" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "#define CONFIG_KVM 1" >> $config_h fi
@@ -2155,19 +2155,19 @@ if test "$target_bigendian" = "yes" ; then echo "#define TARGET_WORDS_BIGENDIAN 1" >> $config_h fi if test "$target_softmmu" = "yes" ; then - echo "CONFIG_SOFTMMU=yes" >> $config_mak + echo "CONFIG_SOFTMMU=y" >> $config_mak echo "#define CONFIG_SOFTMMU 1" >> $config_h fi if test "$target_user_only" = "yes" ; then - echo "CONFIG_USER_ONLY=yes" >> $config_mak + echo "CONFIG_USER_ONLY=y" >> $config_mak echo "#define CONFIG_USER_ONLY 1" >> $config_h fi if test "$target_linux_user" = "yes" ; then - echo "CONFIG_LINUX_USER=yes" >> $config_mak + echo "CONFIG_LINUX_USER=y" >> $config_mak echo "#define CONFIG_LINUX_USER 1" >> $config_h fi if test "$target_darwin_user" = "yes" ; then - echo "CONFIG_DARWIN_USER=yes" >> $config_mak + echo "CONFIG_DARWIN_USER=y" >> $config_mak echo "#define CONFIG_DARWIN_USER 1" >> $config_h fi list=""
@@ -2195,11 +2195,11 @@ if test "$target_cpu" = "arm" \ -o "$target_cpu" = "sparc" \ -o "$target_cpu" = "sparc64" \ -o "$target_cpu" = "sparc32plus"; then - echo "CONFIG_SOFTFLOAT=yes" >> $config_mak + echo "CONFIG_SOFTFLOAT=y" >> $config_mak echo "#define CONFIG_SOFTFLOAT 1" >> $config_h fi if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then - echo "TARGET_HAS_BFLT=yes" >> $config_mak + echo "TARGET_HAS_BFLT=y" >> $config_mak echo "#define TARGET_HAS_BFLT 1" >> $config_h fi if test "$target_user_only" = "yes" \
@@ -2208,11 +2208,11 @@ if test "$target_user_only" = "yes" \ fi # 32 bit ELF loader in addition to native 64 bit loader? if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then - echo "TARGET_HAS_ELFLOAD32=yes" >> $config_mak + echo "TARGET_HAS_ELFLOAD32=y" >> $config_mak echo "#define TARGET_HAS_ELFLOAD32 1" >> $config_h fi if test "$target_bsd_user" = "yes" ; then - echo "CONFIG_BSD_USER=yes" >> $config_mak + echo "CONFIG_BSD_USER=y" >> $config_mak echo "#define CONFIG_BSD_USER 1" >> $config_h fi
Signature · 1 line
1.6.2.2
PATCH 11/14 Substitute ifdef CONFIG_FOO by obj-
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile | 76 ++++++++++++++++++++----------------------------------------- 1 files changed, 25 insertions(+), 51 deletions(-)
Makefile +25 -51
@@ -83,9 +83,7 @@ endif block-obj-y += block/raw-posix.o endif -ifdef CONFIG_CURL -block-obj-y += block/curl.o -endif +block-obj-$(CONFIG_CURL) += block/curl.o ###################################################################### # libqemu_common.a: Target independent part of system emulation. The
@@ -112,8 +110,9 @@ obj-y += qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o obj-y += msmouse.o ps2.o obj-y += qdev.o ssi.o +obj-$(CONFIG_BRLAPI) += baum.o + ifdef CONFIG_BRLAPI -obj-y += baum.o LIBS+=-lbrlapi endif
@@ -123,85 +122,60 @@ else obj-y += migration-exec.o endif -audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o -ifdef CONFIG_SDL -audio-obj-y += sdlaudio.o -endif -ifdef CONFIG_OSS -audio-obj-y += ossaudio.o -endif ifdef CONFIG_COREAUDIO -audio-obj-y += coreaudio.o AUDIO_PT = yes endif -ifdef CONFIG_ALSA -audio-obj-y += alsaaudio.o -endif -ifdef CONFIG_DSOUND -audio-obj-y += dsoundaudio.o -endif ifdef CONFIG_FMOD -audio-obj-y += fmodaudio.o audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS) endif ifdef CONFIG_ESD AUDIO_PT = yes AUDIO_PT_INT = yes -audio-obj-y += esdaudio.o endif ifdef CONFIG_PA AUDIO_PT = yes AUDIO_PT_INT = yes -audio-obj-y += paaudio.o endif ifdef AUDIO_PT LDFLAGS += -pthread endif -ifdef AUDIO_PT_INT -audio-obj-y += audio_pt_int.o -endif + +audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o +audio-obj-$(CONFIG_SDL) += sdlaudio.o +audio-obj-$(CONFIG_OSS) += ossaudio.o +audio-obj-$(CONFIG_COREAUDIO) += coreaudio.o +audio-obj-$(CONFIG_ALSA) += alsaaudio.o +audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o +audio-obj-$(CONFIG_FMOD) += fmodaudio.o +audio-obj-$(CONFIG_ESD) += esdaudio.o +audio-obj-$(CONFIG_PA) += paaudio.o +audio-obj-$(AUDIO_PT_INT) += audio_pt_int.o audio-obj-y += wavcapture.o obj-y += $(addprefix audio/, $(audio-obj-y)) obj-y += keymaps.o -ifdef CONFIG_SDL -obj-y += sdl.o x_keymap.o -endif -ifdef CONFIG_CURSES -obj-y += curses.o -endif +obj-$(CONFIG_SDL) += sdl.o x_keymap.o +obj-$(CONFIG_CURSES) += curses.o obj-y += vnc.o acl.o d3des.o -ifdef CONFIG_VNC_TLS -obj-y += vnc-tls.o vnc-auth-vencrypt.o -endif -ifdef CONFIG_VNC_SASL -obj-y += vnc-auth-sasl.o -endif - -ifdef CONFIG_COCOA -obj-y += cocoa.o -endif - -ifdef CONFIG_IOTHREAD -obj-y += qemu-thread.o -endif +obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o +obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o +obj-$(CONFIG_COCOA) += cocoa.o +obj-$(CONFIG_IOTHREAD) += qemu-thread.o ifdef CONFIG_SLIRP CPPFLAGS+=-I$(SRC_PATH)/slirp +endif + slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o -obj-y += $(addprefix slirp/, $(slirp-obj-y)) -endif +obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y)) LIBS+=$(VDE_LIBS) # xen backend driver support -xen-obj-y := xen_backend.o xen_devconfig.o -xen-obj-y += xen_console.o xenfb.o xen_disk.o xen_nic.o -ifdef CONFIG_XEN - obj-y += $(xen-obj-y) -endif +obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o +obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o LIBS+=$(CURL_LIBS)
Signature · 1 line
1.6.2.2
PATCH 12/14 Substitute ifdef CONFIG_FOO by obj-
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile.target | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-)
Makefile.target +8 -18
@@ -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
Signature · 1 line
1.6.2.2
PATCH 13/14 Rename SOUND_HW to sound-obj-y
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile.target | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
Makefile.target +7 -7
@@ -515,16 +515,16 @@ ifdef CONFIG_OSS LIBS += $(CONFIG_OSS_LIB) endif -SOUND_HW = sb16.o es1370.o ac97.o +sound-obj-y = sb16.o es1370.o ac97.o ifdef CONFIG_ADLIB -SOUND_HW += fmopl.o adlib.o +sound-obj-y += fmopl.o adlib.o adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 endif ifdef CONFIG_GUS -SOUND_HW += gus.o gusemu_hal.o gusemu_mixer.o +sound-obj-y += gus.o gusemu_hal.o gusemu_mixer.o endif ifdef CONFIG_CS4231A -SOUND_HW += cs4231a.o +sound-obj-y += cs4231a.o endif ifdef CONFIG_VNC_TLS
@@ -562,7 +562,7 @@ obj-y += wdt_ib700.o wdt_i6300esb.o ifeq ($(TARGET_BASE_ARCH), i386) # Hardware support -obj-y += ide.o pckbd.o vga.o $(SOUND_HW) dma.o +obj-y += ide.o pckbd.o vga.o $(sound-obj-y) dma.o obj-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o obj-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
@@ -572,7 +572,7 @@ endif ifeq ($(TARGET_BASE_ARCH), ppc) CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE # shared objects -obj-y += ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o +obj-y += ppc.o ide.o vga.o $(sound-obj-y) dma.o openpic.o # PREP target obj-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o obj-y += prep_pci.o ppc_prep.o
@@ -598,7 +598,7 @@ obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o obj-y += g364fb.o jazz_led.o dp8393x.o obj-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o -obj-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW) +obj-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(sound-obj-y) obj-y += mipsnet.o obj-y += pflash_cfi01.o obj-y += vmware_vga.o
Signature · 1 line
1.6.2.2
PATCH 14/14 Substitute ifdef CONFIG_FOO by sound-obj-
In reply to [email protected]From: Juan Quintela <[email protected]>
--- Makefile.target | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
Makefile.target +8 -8
@@ -515,17 +515,17 @@ ifdef CONFIG_OSS LIBS += $(CONFIG_OSS_LIB) endif -sound-obj-y = sb16.o es1370.o ac97.o +sound-obj-y = +sound-obj-$(CONFIG_SB16) += sb16.o +sound-obj-$(CONFIG_ES1370) += es1370.o +sound-obj-$(CONFIG_AC97) += ac97.o +sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o +sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o +sound-obj-$(CONFIG_CS4321A) += cs4231a.o + ifdef CONFIG_ADLIB -sound-obj-y += fmopl.o adlib.o adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 endif -ifdef CONFIG_GUS -sound-obj-y += gus.o gusemu_hal.o gusemu_mixer.o -endif -ifdef CONFIG_CS4231A -sound-obj-y += cs4231a.o -endif ifdef CONFIG_VNC_TLS CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
Signature · 1 line
1.6.2.2
Re: [Qemu-devel] [PATCH 06/14] Rename SLIRP_OBJS to slirp-obj-y
In reply to [email protected]Quoted 6 lines · On Thu, 2009-06-25 at 00:08 +0200, [email protected] wrote:
Makefile +0
-0@@ -188,10 +188,10 @@ endif
Makefile endif · line 194
Quoted 10 lines
Makefile +4
-4ifdef CONFIG_SLIRP CPPFLAGS+=-I$(SRC_PATH)/slirp -SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \ -slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o \ -tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o -OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) +slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o +slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o +slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o +OBJS+=$(addprefix slirp/, $(slirp-obj-y))
I like the whole series, but I think I'd drop this change and the XEN_OBJS change.
We won't be individually configuring out any of SLIRP_OBJS, so an end result like:
obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(SLIRP_OBJS))
seems nicer to me than:
obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
Cheers,
Mark.
[Qemu-devel] Re: [PATCH 06/14] Rename SLIRP_OBJS to slirp-obj-y
Quoted 22 lines · Mark McLoughlin
Quoted 6 lines · On Thu, 2009-06-25 at 00:08 +0200, [email protected] wrote:
Makefile +0
-0@@ -188,10 +188,10 @@ endifMakefile endif · line 194
Quoted 10 lines
Makefile +4
-4ifdef CONFIG_SLIRP CPPFLAGS+=-I$(SRC_PATH)/slirp -SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \ -slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o \ -tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o -OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) +slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o +slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o +slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o +OBJS+=$(addprefix slirp/, $(slirp-obj-y))I like the whole series, but I think I'd drop this change and the
XEN_OBJSchange.
Quoted 8 lines
We won't be individually configuring out any of
SLIRP_OBJS, so an end result like:obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(SLIRP_OBJS))seems nicer to me than:
obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
I haven't looked at SLIRP, just wondered if we wanted to remove bootp/tftp at any moment. I tried to Make all the Makefiles use the same style.
Quoted 2 lines
Cheers,
Mark.
XEN_OBJS became:
-XEN_OBJS := xen_backend.o xen_devconfig.o
-XEN_OBJS += xen_console.o xenfb.o xen_disk.o xen_nic.o -ifdef CONFIG_XEN
- OBJS += $(XEN_OBJS)
-endif
+obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o +obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
and
-XEN_OBJS := xen_machine_pv.o xen_domainbuild.o +obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
ifeq ($(CONFIG_XEN), yes)
- OBJS += $(XEN_OBJS)
LIBS += $(XEN_LIBS)
endif
i.e. XEN_OBJS don't exist anymore, what do you mean here? Remove the intermediate change?
Later, Juan.