From patchwork Tue Mar 28 05:36:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 96099 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp1550721qgd; Mon, 27 Mar 2017 22:38:58 -0700 (PDT) X-Received: by 10.84.230.135 with SMTP id e7mr34517178plk.20.1490679538529; Mon, 27 Mar 2017 22:38:58 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d10si3043577pgf.3.2017.03.27.22.38.58; Mon, 27 Mar 2017 22:38:58 -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 S1754158AbdC1Fh7 (ORCPT + 19 others); Tue, 28 Mar 2017 01:37:59 -0400 Received: from mail-lf0-f51.google.com ([209.85.215.51]:36567 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753072AbdC1Fhy (ORCPT ); Tue, 28 Mar 2017 01:37:54 -0400 Received: by mail-lf0-f51.google.com with SMTP id x137so32113959lff.3 for ; Mon, 27 Mar 2017 22:36:51 -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=PUV7MG//6t6UfQUqklREXDBi6Pke0zaGv1Los5fgMuc=; b=eoBSbGtm1oF0NLhb5DLIe3wJF8hxKoqA6nJCTYXK6Xf0ut2nb2JXGSxi8FU3TEssAu bxQ5V2gvOWCJBUCT4KGV8UyUclatXrcStfw/A74+nn0QdVY0mqxB3vh2d6WrkcBhPSsy 7X/DBMjWW/pFM7t7dmve/ld9ElXUXqobNXCQI= 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=PUV7MG//6t6UfQUqklREXDBi6Pke0zaGv1Los5fgMuc=; b=Ni0qdfOv2c/MefHW9+Rziv2EUSOVDDrtCUAkMshyhGpgTrpIdYWTRuVaiRF7PpcdGk FeoYRfYYoAg0ydInIgolFDXQCN0f1jkS5duQKWzRvLwXp2OByy1Qr6YJTBUAqiFZrXNP khuEriAeqacAdd+/DroE+pzL9yRGGHoo8aVjiG5yEuYe6qzVSpOIa3XdcNS95o6yMHuX F1bhw4OL/bsT06CiFF5/zcbPmPvSJj54VBfGAs1F/V1at5RWwVhZ6OLOkcHloMoPbZQx XB5G26lkrjm5kNv5xCULJP+PKBr3HUg4Eiauomkc+HZNvLiMNfWiOsWvVTn4uXjrh0sV OlUg== X-Gm-Message-State: AFeK/H3OuZZzIZuPB/6iyu7im/Z7wAMlbB5rHSr9L+V+99roD2TfR5KQTqNDJa3bF+RwdxCn X-Received: by 10.25.206.135 with SMTP id e129mr10551973lfg.112.1490679396883; Mon, 27 Mar 2017 22:36:36 -0700 (PDT) Received: from localhost.localdomain (a91-156-68-16.elisa-laajakaista.fi. [91.156.68.16]) by smtp.gmail.com with ESMTPSA id l11sm472282ljb.45.2017.03.27.22.36.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Mar 2017 22:36:35 -0700 (PDT) From: Fathi Boudra To: linux-kselftest@vger.kernel.org, Shuah Khan Cc: linux-kernel@vger.kernel.org, Bamvor Jian Zhang , Michael Ellerman , Fathi Boudra Subject: [PATCH v2] selftests: gpio: fix Makefile Date: Tue, 28 Mar 2017 08:36:34 +0300 Message-Id: <20170328053634.4968-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. Note: if pkg-config is missing (command not found), it will fail to build because headers can't be found or libmount library can't be linked. * 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. * Get rid of INSTALL_HDR_PATH. We don't need it since make -C is putting us in the right location. * Improve readibility: - introduce GPIODIR/GPIOOBJ/GPIOINC variables - split CFLAGS on multiple lines Signed-off-by: Fathi Boudra --- in v2: * per Michael Ellerman request, revert to use exported headers instead of uapi. tools/testing/selftests/gpio/Makefile | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) -- 2.11.0 diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile index 205e4d10e085..41826897af35 100644 --- a/tools/testing/selftests/gpio/Makefile +++ b/tools/testing/selftests/gpio/Makefile @@ -1,23 +1,28 @@ +CFLAGS += -O2 -g -std=gnu99 -Wall +CFLAGS += -I../../../../usr/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 +GPIOINC := gpio.h include ../lib.mk -all: $(BINARIES) +all: $(GPIOINC) $(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 + $(RM) $(TEST_PROGS_EXTENDED) + $(MAKE) -C $(GPIODIR) clean -../../../gpio/gpio-utils.o: - make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C ../../../gpio +$(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) -../../../../usr/include/linux/gpio.h: - make -C ../../../.. headers_install INSTALL_HDR_PATH=$(shell pwd)/../../../../usr/ +$(GPIODIR)/$(GPIOOBJ): + $(MAKE) -C $(GPIODIR) +$(GPIOINC): + $(MAKE) -C ../../../.. headers_install