diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-09-17 08:35:53 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-19 08:29:06 +0100 |
| commit | 525877c9992a07d424be4cfdd4ba13a69141a513 (patch) | |
| tree | 1f5a4e3099c415cfd984f8aa963e526e29bba2ce | |
| parent | 4e8cb28c4b536bf408c1ba01710e2a7644e144e5 (diff) | |
build: move rules from Makefile to */Makefile.objs
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | audio/Makefile.objs | 3 | ||||
| -rw-r--r-- | block/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/Makefile.objs | 2 | ||||
| -rw-r--r-- | ui/Makefile.objs | 5 |
5 files changed, 12 insertions, 10 deletions
@@ -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 diff --git a/audio/Makefile.objs b/audio/Makefile.objs index 0f2932d1b3..d71a877249 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -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) diff --git a/block/Makefile.objs b/block/Makefile.objs index 7f015105b1..c067f38e1d 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -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) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index bcf278d4ec..2778035b1c 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -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) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index adc07be761..fd339d247b 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -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 |