From patchwork Fri Mar 24 11:55:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 95930 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp5479qgd; Fri, 24 Mar 2017 04:56:06 -0700 (PDT) X-Received: by 10.98.11.144 with SMTP id 16mr8716988pfl.78.1490356566198; Fri, 24 Mar 2017 04:56:06 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l4si2578083plk.123.2017.03.24.04.56.05; Fri, 24 Mar 2017 04:56:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935893AbdCXLzp (ORCPT + 17 others); Fri, 24 Mar 2017 07:55:45 -0400 Received: from mail-lf0-f49.google.com ([209.85.215.49]:35867 "EHLO mail-lf0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935564AbdCXLzf (ORCPT ); Fri, 24 Mar 2017 07:55:35 -0400 Received: by mail-lf0-f49.google.com with SMTP id y193so4815895lfd.3 for ; Fri, 24 Mar 2017 04:55:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=fYbN90l122glpx108Rc7aFIrS91O0ANPeeKGEoz/b9g=; b=WWvX1WlmwBRxnpQCrtR5pOMcwUgLCtDIR7AuP4AfrsAvbwar7XRPJLOCTH6U558v05 0Q9E4EkZUjmEiFpspyDMo7z8Z/6sJF8BHTBXqYoBQL1ehHTkA7V7eDaKgyy61K5fTPaG szW5lNeHx0ym5clTX9tD3Fs+jNslBdIY8zgPA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fYbN90l122glpx108Rc7aFIrS91O0ANPeeKGEoz/b9g=; b=CR3nHyM6/PjU35TePC9rOIYk9tqrrSFg5I58mlp9Z88wGtXm7RKib6DZsvBxB080Jx UvW4yPxkKSJ5wOzYNNnoVfuhOHFhaPtYRhOsx3YsWEdMXopTaEw2Rd3XN2a0NvH/e6cX F1V41BZy/0Cg66Ur7O8wJolGNouwxVcbmardDM8CwpM2MRuKU0wM6Tn/zP9x1DL/XSn1 0XIiP97VwAC2XjgIUap5f7wF+WVFSVrJlNp3/ng/VzA9SfZ4VTpiZaNfWOR//n0ME+50 Tk9gQMugpmDb4OneDvMn5dETd81GXZhivL5nxf6BOPn4rUPaeT5ITXNr8LajauagxlPi e4qw== X-Gm-Message-State: AFeK/H0SxFbfknBPTzJuJDJwrbBnfDa32i0/qtnGj5RKpb356AEwNY2jMgF2WZhbBsn7PNxQ X-Received: by 10.25.22.232 with SMTP id 101mr1365480lfw.133.1490356533284; Fri, 24 Mar 2017 04:55:33 -0700 (PDT) Received: from localhost.localdomain (a91-156-68-16.elisa-laajakaista.fi. [91.156.68.16]) by smtp.gmail.com with ESMTPSA id g85sm341887lji.22.2017.03.24.04.55.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Mar 2017 04:55:32 -0700 (PDT) From: Fathi Boudra To: linux-kselftest@vger.kernel.org, Shuah Khan Cc: linux-kernel@vger.kernel.org, Bamvor Jian Zhang , Fathi Boudra Subject: [PATCH] selftests: gpio: fix Makefile Date: Fri, 24 Mar 2017 13:55:27 +0200 Message-Id: <20170324115527.26472-1-fathi.boudra@linaro.org> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Fix hardcoded and misplaced libmount headers. Use pkg-config instead to figure out CFLAGS/LDLIBS, fixing also their value for cross-compilation. * Fix the clean target to clean up also gpio-utils. * Fix gpio-mockup-chardev installation by using TEST_PROGS_EXTENDED instead of BINARIES which is not supported by the top-level lib.mk. * Remove dependency to headers_install as we can simply use gpio.h from user space API directly. * Improve readibility: - introduce GPIODIR/GPIOOBJ variables - split CFLAGS on multiple lines Signed-off-by: Fathi Boudra --- tools/testing/selftests/gpio/Makefile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) -- 2.11.0 diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile index 205e4d10e085..714f1f7df04d 100644 --- a/tools/testing/selftests/gpio/Makefile +++ b/tools/testing/selftests/gpio/Makefile @@ -1,23 +1,24 @@ +CFLAGS += -O2 -g -std=gnu99 -Wall +CFLAGS += -I../../../../include/uapi/ -I../../../../include/ +CFLAGS += $(shell pkg-config --cflags mount) +LDLIBS += $(shell pkg-config --libs mount) TEST_PROGS := gpio-mockup.sh -TEST_FILES := gpio-mockup-sysfs.sh $(BINARIES) -BINARIES := gpio-mockup-chardev +TEST_PROGS_EXTENDED := gpio-mockup-chardev +TEST_FILES := gpio-mockup-sysfs.sh + +GPIODIR := ../../../gpio +GPIOOBJ := gpio-utils.o include ../lib.mk -all: $(BINARIES) +all: $(TEST_PROGS_EXTENDED) clean: - $(RM) $(BINARIES) - -CFLAGS += -O2 -g -std=gnu99 -Wall -I../../../../usr/include/ -LDLIBS += -lmount -I/usr/include/libmount - -$(BINARIES): ../../../gpio/gpio-utils.o ../../../../usr/include/linux/gpio.h - -../../../gpio/gpio-utils.o: - make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C ../../../gpio + $(RM) $(TEST_PROGS_EXTENDED) + $(MAKE) -C $(GPIODIR) clean -../../../../usr/include/linux/gpio.h: - make -C ../../../.. headers_install INSTALL_HDR_PATH=$(shell pwd)/../../../../usr/ +$(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) +$(GPIODIR)/$(GPIOOBJ): + $(MAKE) -C $(GPIODIR)