Commit 525877c9 authored Sep 17, 2012 by Paolo Bonzini

build: move rules from Makefile to */Makefile.objs



Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 4e8cb28c

Makefile

+0 −10

Original line number	Diff line number	Diff line
		@@ -141,16 +141,6 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))

		recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)

		audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)

		QEMU_CFLAGS+=$(CURL_CFLAGS)

		ui/cocoa.o: ui/cocoa.m

		ui/sdl.o audio/sdlaudio.o ui/sdl_zoom.o hw/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)

		ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)

		bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)

		version.o: $(SRC_PATH)/version.rc config-host.h

audio/Makefile.objs

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,6 @@ common-obj-$(CONFIG_WINWAVE) += winwaveaudio.o
		common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
		common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
		common-obj-y += wavcapture.o

		$(obj)/audio.o $(obj)/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
		$(obj)/sdlaudio.o: QEMU_CFLAGS += $(SDL_CFLAGS)

block/Makefile.objs

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,3 +18,5 @@ endif
		common-obj-y += stream.o
		common-obj-y += commit.o
		common-obj-y += mirror.o

		$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS)

hw/Makefile.objs

+2 −0

Original line number	Diff line number	Diff line
		@@ -204,3 +204,5 @@ ifeq ($(CONFIG_PCI), y)
		obj-$(CONFIG_KVM) += ivshmem.o
		obj-$(CONFIG_LINUX) += vfio_pci.o
		endif

		$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)

ui/Makefile.objs

+5 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,8 @@ common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
		common-obj-$(CONFIG_COCOA) += cocoa.o
		common-obj-$(CONFIG_CURSES) += curses.o
		common-obj-$(CONFIG_VNC) += $(vnc-obj-y)

		$(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS)
		$(obj)/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)

		$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m