From patchwork Thu Oct 17 15:35:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 284267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 184212C00C3 for ; Fri, 18 Oct 2013 02:38:17 +1100 (EST) Received: from localhost ([::1]:52882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWpeQ-0002p6-Vq for incoming@patchwork.ozlabs.org; Thu, 17 Oct 2013 11:38:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWpcB-00007m-QB for qemu-devel@nongnu.org; Thu, 17 Oct 2013 11:36:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VWpc6-0004fp-5M for qemu-devel@nongnu.org; Thu, 17 Oct 2013 11:35:55 -0400 Received: from mail-ea0-x22f.google.com ([2a00:1450:4013:c01::22f]:41596) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWpc5-0004fX-7a for qemu-devel@nongnu.org; Thu, 17 Oct 2013 11:35:49 -0400 Received: by mail-ea0-f175.google.com with SMTP id m14so1150352eaj.20 for ; Thu, 17 Oct 2013 08:35:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zz+vECKqLNr/fIWtojcVStRYipOfcgSTk2KHIOS4ExY=; b=OH9mjP6UE+ZiQ8H30Mp6CuujNxjpiOoGe1ZhDBRNhU55FhGMpG2v2N9EauqRVY4nf3 40PdwFNQn0kBjw6ha3XwCjtScQLNHymPBibFJMJtalnINhhxCJBG7tPIrGDFJcYfMC79 JAbMxLWQ2Z+PdabMY9w/K2gIe0Aw+NZF+QC9gGLcQb3yZKuAC/gDP6VL43r5pNKgdMW3 ojlUg9GndSoGlwIlnyGXfLUBUL35puJhcVFlKJZJG1Js6S0hDD/Lu/fqYlWgdylYi130 e14crGT/aduT4RXImvnsJlgYEaIB5OkEj3LjnknTeLQ6MpTgkgknOvtbpelcUJk29+Kc C6ng== X-Received: by 10.15.44.202 with SMTP id z50mr4445041eev.68.1382024148456; Thu, 17 Oct 2013 08:35:48 -0700 (PDT) Received: from playground.lan (net-37-116-196-7.cust.dsl.vodafone.it. [37.116.196.7]) by mx.google.com with ESMTPSA id l49sm110160180eeo.12.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 17 Oct 2013 08:35:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 17 Oct 2013 17:35:33 +0200 Message-Id: <1382024133-15764-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382024133-15764-1-git-send-email-pbonzini@redhat.com> References: <1382024133-15764-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22f Cc: Peter Maydell , Fam Zheng Subject: [Qemu-devel] [PULL 5/5] ui/Makefile.objs: delete unnecessary cocoa.o dependency 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 From: Peter Maydell Delete an unnecessary dependency for cocoa.o; we already have a general rule that tells Make that we can build a .o file from a .m source using an ObjC compiler, so this specific rule is unnecessary. Further, it is using the dubious construct "$(SRC_PATH)/$(obj)" to get at the source directory, which will break when $(obj) is redefined as part of the preparation for per-object library support. Signed-off-by: Peter Maydell Signed-off-by: Fam Zheng Signed-off-by: Paolo Bonzini --- ui/Makefile.objs | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 6ddc0de..f33be47 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -17,6 +17,4 @@ common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o $(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) -$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m - $(obj)/gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS)