From patchwork Wed Sep 11 16:49:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 19976 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f71.google.com (mail-vb0-f71.google.com [209.85.212.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DFCCC248D9 for ; Wed, 11 Sep 2013 16:50:01 +0000 (UTC) Received: by mail-vb0-f71.google.com with SMTP id g17sf10569507vbg.6 for ; Wed, 11 Sep 2013 09:50:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=ta1cCocCcGHf4yPIbnv80UxNLuWfqBH1I+onqDJrLdo=; b=D6rCIv3t8yYFQCtlMYWVHY1iZJ0f3wD0am1gAhvVcZKV0u0A8AqpavJkyxLKcVbyOh 0RID6bArXmQPd5mpBLPtfEDFIE8HCduVetlLZhUmK6g77Fo1S+tnev4VNq2VXAhqraRy Qgtmxklb9beK9oYQM2J0Fvg2QYDGdzUByUjoEal6wB4ByA5EpMwikh+QOWrTu7h0Oo3a rxcOyFfCJH1H/4DhP9xxqmu0PsZYLs8exU7ba5MUgo1r2xSDZYYn3b0Ld+Ih42IpjJ0C xqngJfFazUuJ4OUtpeWSp52AUh/Giwpi//+8W184wwXWrxQGEh3ph1LZnBw45yfn726Z S+WQ== X-Received: by 10.236.4.69 with SMTP id 45mr969901yhi.20.1378918201285; Wed, 11 Sep 2013 09:50:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.35 with SMTP id q3ls326017qev.50.gmail; Wed, 11 Sep 2013 09:50:01 -0700 (PDT) X-Received: by 10.58.168.205 with SMTP id zy13mr137164veb.19.1378918201046; Wed, 11 Sep 2013 09:50:01 -0700 (PDT) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id ch11si6285710ved.101.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Sep 2013 09:50:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id q14so6417939vbe.13 for ; Wed, 11 Sep 2013 09:50:01 -0700 (PDT) X-Gm-Message-State: ALoCoQnGmya1DWPImIIBZ+VkrfVaJyVT/c7+CRVQuEZI7CDers1DaELju2t9KvvP211ud3GC+0aj X-Received: by 10.221.6.195 with SMTP id ol3mr916335vcb.34.1378918200890; Wed, 11 Sep 2013 09:50:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp67296vcz; Wed, 11 Sep 2013 09:50:00 -0700 (PDT) X-Received: by 10.180.187.202 with SMTP id fu10mr18267838wic.9.1378918199657; Wed, 11 Sep 2013 09:49:59 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id ea8si5662128wic.79.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 11 Sep 2013 09:49:59 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1VJnc5-0002MD-8K; Wed, 11 Sep 2013 17:49:57 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-trivial@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Fam Zheng , Paolo Bonzini Subject: [PATCH] ui/Makefile.objs: delete unnecessary cocoa.o dependency Date: Wed, 11 Sep 2013 17:49:57 +0100 Message-Id: <1378918197-9036-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Reviewed-by: Andreas Färber --- This needs to go in before Fam's patchset for modules can be applied, either via a cocoa maintainer queue or via -trivial or just as a first patch on the front of Fam's patches if they would otherwise be being held up by this. 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)