From patchwork Thu Feb 11 15:38:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 8281641 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 471C0BEEE5 for ; Thu, 11 Feb 2016 15:41:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E15E20306 for ; Thu, 11 Feb 2016 15:41:10 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C800620225 for ; Thu, 11 Feb 2016 15:41:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTtK7-00082k-K5; Thu, 11 Feb 2016 15:38:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTtK6-00081i-60 for xen-devel@lists.xen.org; Thu, 11 Feb 2016 15:38:26 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 54/F3-13487-1FAACB65; Thu, 11 Feb 2016 15:38:25 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-7.tower-206.messagelabs.com!1455205104!21539142!1 X-Originating-IP: [81.169.146.219] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12323 invoked from network); 11 Feb 2016 15:38:24 -0000 Received: from mo4-p00-ob.smtp.rzone.de (HELO mo4-p00-ob.smtp.rzone.de) (81.169.146.219) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 11 Feb 2016 15:38:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1455205104; l=1280; s=domk; d=aepfle.de; h=Content-Transfer-Encoding:MIME-Version:Date:Subject:Cc:To:From; bh=HcfF7ooeIx3b+jka68BtlvzYT+n2DW8X0fQQZjg1zC4=; b=bC4u5MmbObQ+zcjq/UUJbKUGKaijuQYDJZ2gEhrpDLXHFC8bIoHRt6kyFvxmD7jAPPe 2tGM/sp0UgrpSIpsKPVcpfmAgv8aJX6u2XNk5UsT1rgwtS9KwuXGnSdCHzHhlg8WBZehr 9+I5EETzQLgwH9ALPMscKZXNQMEyrlHBehY= X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+yackYocTD1iAi8x+OWi/zfN1cLnDYUgqTAeBk4W9EFsLck0gEijGtGt7SdlAgbDwNSgoEg== X-RZG-CLASS-ID: mo00 Received: from probook ([2001:a62:113c:45ff:eda7:f4e4:eebe:c2e3]) by smtp.strato.de (RZmta 37.17 AUTH) with ESMTPSA id n02e7bs1BFcOfyo (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Thu, 11 Feb 2016 16:38:24 +0100 (CET) Received: by probook (Postfix, from userid 1000) id E4E7C508D4; Thu, 11 Feb 2016 16:38:23 +0100 (CET) From: Olaf Hering To: xen-devel@lists.xen.org Date: Thu, 11 Feb 2016 15:38:14 +0000 Message-Id: <1455205094-24323-1-git-send-email-olaf@aepfle.de> X-Mailer: git-send-email 2.7.0 MIME-Version: 1.0 Cc: Wei Liu , Olaf Hering , Ian Jackson , Ian Campbell , Stefano Stabellini Subject: [Xen-devel] [PATCH] tools/console: correct make dependencies for _paths.h X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Correct dependencies for _paths.h to avoid build failure with make -j. Only main.c requires _paths.h. This fixes commit 8398ec70 ("xenconsole: Ensure exclusive access to console using locks") Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- Should be backported to 4.6 tools/console/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/console/Makefile b/tools/console/Makefile index 6eeac8f..a7bec75 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -30,7 +30,8 @@ daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) -xenconsole: client/_paths.h $(patsubst %.c,%.o,$(wildcard client/*.c)) +client/main.o: client/_paths.h +xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) $(APPEND_LDFLAGS) genpath-target = $(call buildmakevars2header,client/_paths.h)