From patchwork Mon Nov 10 14:09:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 40489 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 89195218DE for ; Mon, 10 Nov 2014 14:11:58 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id gq15sf5209379lab.2 for ; Mon, 10 Nov 2014 06:11:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=mDOPMOAck8zHZ8QhTqVtpPmLXSPlSxPtHs3QGgOjN0I=; b=Kku6egPcBuDZstVOiM9c378G6VRGAQ7JrTuSod7V5cgkGio6KEKe6l+vrucB+oJ1vc qixRwouzgWlnxw/lyeVZFftAJOwuSxoid0GMAGQyIiWdk0SKf8L5D6RxRfDTrK3Q4wcS cNNIUU/xpqZAlbg9jH9T3QS/r2hi5p88vnlrcsagnsCdo36uYaDHZwZ8ldeDgtoXAcRq cwfQICiLwVic90usjdyMNcxrrXhUu1XU+Uu7mmZondZqx8oBlHLjutLb0mp7XqBRetVN ixpwMYJO6t6C0O2Dc0Yolm013CFvQa0XAWj9sFTsEMeX/iwSgSpLSu8UarQj7Xx0nQ5h /Dgg== X-Gm-Message-State: ALoCoQlBQcbplVTdK16/GKVnKT8u8LYEo4ExWKJCzGBn17QPeO5xAkU0A6wb88/I4I5LE3yBDvSr X-Received: by 10.194.61.243 with SMTP id t19mr557523wjr.5.1415628716876; Mon, 10 Nov 2014 06:11:56 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.225 with SMTP id bb1ls359245lab.47.gmail; Mon, 10 Nov 2014 06:11:56 -0800 (PST) X-Received: by 10.112.137.202 with SMTP id qk10mr29652527lbb.0.1415628716547; Mon, 10 Nov 2014 06:11:56 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id jj7si27217689lbc.65.2014.11.10.06.11.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 06:11:56 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id mc6so7832994lab.12 for ; Mon, 10 Nov 2014 06:11:56 -0800 (PST) X-Received: by 10.112.12.35 with SMTP id v3mr2808861lbb.80.1415628716456; Mon, 10 Nov 2014 06:11:56 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp92927lbc; Mon, 10 Nov 2014 06:11:55 -0800 (PST) X-Received: by 10.220.195.132 with SMTP id ec4mr21565099vcb.16.1415628714240; Mon, 10 Nov 2014 06:11:54 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id xx5si10852158vcb.100.2014.11.10.06.11.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Nov 2014 06:11:54 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnpfT-0006FM-L6; Mon, 10 Nov 2014 14:10:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnpfS-0006Ez-Ik for xen-devel@lists.xen.org; Mon, 10 Nov 2014 14:10:06 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id C8/B1-09842-D37C0645; Mon, 10 Nov 2014 14:10:05 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1415628603!12768613!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14437 invoked from network); 10 Nov 2014 14:10:05 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2014 14:10:05 -0000 X-IronPort-AV: E=Sophos;i="5.07,353,1413244800"; d="scan'208";a="189748038" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 10 Nov 2014 09:10:03 -0500 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XnpfO-0006Jw-IZ; Mon, 10 Nov 2014 14:10:03 +0000 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Mon, 10 Nov 2014 14:10:02 +0000 From: Ian Campbell To: , Christoffer Dall Date: Mon, 10 Nov 2014 14:09:59 +0000 Message-ID: <1415628601-31075-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 2/4] Fix build when Xen is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: If Xen isn't enabled then XEN_IMAGE ends up as "no.o", which obviously doesn't exist. Handle the dependency explicitly. Signed-off-by: Ian Campbell --- Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ed5acbb..6c2786e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,7 +98,10 @@ all: $(IMAGE) $(XIMAGE) CLEANFILES = $(IMAGE) boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb -$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE) +if XEN +XEN_IMAGE_DEP = $(XEN_IMAGE) +endif +$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE_DEP) $(LD) -o $@ --script=model.lds %.o: %.S Makefile