From patchwork Tue Jan 6 10:41:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arik Nemtsov X-Patchwork-Id: 5572931 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@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 A63FABF6C3 for ; Tue, 6 Jan 2015 10:56:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC6882020E for ; Tue, 6 Jan 2015 10:56:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC1F620218 for ; Tue, 6 Jan 2015 10:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754818AbbAFKtz (ORCPT ); Tue, 6 Jan 2015 05:49:55 -0500 Received: from mail-wg0-f45.google.com ([74.125.82.45]:33047 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754649AbbAFKty (ORCPT ); Tue, 6 Jan 2015 05:49:54 -0500 Received: by mail-wg0-f45.google.com with SMTP id b13so29070040wgh.4 for ; Tue, 06 Jan 2015 02:49:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=f3r/1d6YGG5Rz1nwkrc/RIOJ4R75eisV8bqxmDiNXlA=; b=htQl5TUkxq6k6gGwWlESor0ZOVHOCzE8qqFueKUb5g3m1wh/v/Zxq9swLh+O1qtgaq WLhuP9JGzcStjOvq0JQMR56vawwNX/s9YYj2IOivFDYCLIGpjtArevLNFy7m+8qphBL6 kt+9C0RXbDFItK13v3QOYBxqEGpjLl4oyKLaNMcNh1IBI5Lp9tVGs9UMJ/iPDMxEFWgs I6u5gVG9a5j//CaDJONxU0KHeo/dp9pmDwH/n8FJRgPE0BKYfqgUaf9/1Tjdn9vHfsP4 RCGCvDBnMVDJd2DkeTV61/oNiiDK9hExdJNlEWsRWQUcJmbWkWgpJfmEVBqTeoRW0NCk 1XHw== X-Gm-Message-State: ALoCoQkPKIDWGGHTKDKSc8gQb369JOnvgRSuF1DKrVSJpTceY9NyWzmtsOZEhH1BaR3CAGAMrRmD X-Received: by 10.194.59.234 with SMTP id c10mr192923916wjr.49.1420540895454; Tue, 06 Jan 2015 02:41:35 -0800 (PST) Received: from athena.ger.corp.intel.com (89-138-233-251.bb.netvision.net.il. [89.138.233.251]) by mx.google.com with ESMTPSA id q7sm13432956wiv.8.2015.01.06.02.41.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Jan 2015 02:41:34 -0800 (PST) From: Arik Nemtsov To: Cc: Johannes Berg , Arik Nemtsov Subject: [PATCH] iw: don't define iw target in Android build Date: Tue, 6 Jan 2015 12:41:32 +0200 Message-Id: <1420540892-21478-1-git-send-email-arik@wizery.com> X-Mailer: git-send-email 2.1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Otherwise Android gets confused and tries to build the Makefile target Signed-off-by: Arik Nemtsov --- Android.mk | 1 + Makefile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Android.mk b/Android.mk index 8afda1d..00c8c49 100644 --- a/Android.mk +++ b/Android.mk @@ -3,6 +3,7 @@ IW_SOURCE_DIR := $(LOCAL_PATH) include $(CLEAR_VARS) +IW_ANDROID_BUILD=y NO_PKG_CONFIG=y include $(LOCAL_PATH)/Makefile diff --git a/Makefile b/Makefile index 5bf955d..58755dc 100644 --- a/Makefile +++ b/Makefile @@ -101,9 +101,11 @@ version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefil @$(NQ) ' CC ' $@ $(Q)$(CC) $(CFLAGS) -c -o $@ $< +ifeq ($(IW_ANDROID_BUILD),) iw: $(OBJS) @$(NQ) ' CC ' iw $(Q)$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o iw +endif check: $(Q)$(MAKE) all CC="REAL_CC=$(CC) CHECK=\"sparse -Wall\" cgcc"