From patchwork Thu Dec 6 13:06:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 204268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D06AD2C01C2 for ; Fri, 7 Dec 2012 02:01:47 +1100 (EST) Received: from localhost ([::1]:44232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgcxO-0005RE-3F for incoming@patchwork.ozlabs.org; Thu, 06 Dec 2012 10:01:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbBE-0003op-3N for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:08:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgbB5-000515-UT for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:07:56 -0500 Received: from mail-ia0-f181.google.com ([209.85.210.181]:44177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgbB4-0004zB-Mv for qemu-devel@nongnu.org; Thu, 06 Dec 2012 08:07:47 -0500 Received: by mail-ia0-f181.google.com with SMTP id s32so4239673iak.26 for ; Thu, 06 Dec 2012 05:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=AcbBD+EVvVdpcUd2y7/1YOSgvGBu0EnGIRr7zFjovK0=; b=f66QNBaFZO44NdA+yuDCykqDoNfvcmE36D6zF8WhCxEqdR8kp9WM6Gkqu3WWCctpyo rfgCSwADROH8ADHvIupoAN2tsxgw0/4sCBtFqcQ2bbY2g0PKPbocSmaqFLDT9TdXvb4e 6IvqLQ0M5BqAvAwwdTrHbd8iTDz4CKZZvWGqWugBM9Uf+Qisn0SJslR1FKDX11O8fRO6 9U7Rl9ZtE3yfLo6XnVy0pCAieAIr5bwjrrLGIQ4xpvFfT+xKemEdKry0WSffzqZ//Mor XmLBM5ztZyBZHW1Fbpas7OvQ8czRxHuLxTZK32O97td1OSitJqcdbtbtOSJbm6QFbNfS DPfg== Received: by 10.50.202.73 with SMTP id kg9mr5556330igc.51.1354799259848; Thu, 06 Dec 2012 05:07:39 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id wm10sm15431723igc.2.2012.12.06.05.07.37 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Dec 2012 05:07:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 6 Dec 2012 14:06:43 +0100 Message-Id: <1354799230-30904-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1354799230-30904-1-git-send-email-pbonzini@redhat.com> References: <1354799230-30904-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.181 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- Makefile | 10 ---------- audio/Makefile.objs | 3 +++ block/Makefile.objs | 2 ++ hw/Makefile.objs | 2 ++ ui/Makefile.objs | 5 +++++ 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9ebd3cd..5810718 100644 --- a/Makefile +++ b/Makefile @@ -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 0f2932d..d71a877 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 7f01510..c067f38 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 d581d8d..864bb55 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -209,3 +209,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 adc07be..fd339d2 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