From patchwork Tue Nov 22 00:11:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 24063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1912186wrr; Mon, 21 Nov 2022 16:21:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf5xsTIXu93IMEItjYQRtqKnyAFDOF8n2R81MnouoG6URZdESjQjxTmk71arixz09WI6S3mI X-Received: by 2002:a17:906:9c47:b0:78d:8fa5:c326 with SMTP id fg7-20020a1709069c4700b0078d8fa5c326mr5819115ejc.25.1669076463265; Mon, 21 Nov 2022 16:21:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669076463; cv=none; d=google.com; s=arc-20160816; b=N5XPXEf+Q8dPc7v+e1zUy7sIl/xYU1xzhkqQTl2a1Mx33r3KfyXVyXDqb0gH71Rjfu 4oZcYWRvpZ4m2fg+WDXQ/acKeo4+1pTGmmj8aJoIwdOkMelV34hzCh3ohFdLpf1I0K9y SrHL/EASzs1KRhwr0lKdMkPdQ4F+JlGxJT8P5qdZ8N+WmYKfSiSpJMT6quaNjt2+cSIy QxSIj56LyPfZwvG+cNpgChJ+9FvnNxR42/P72GDTC6jkpeZ0S9zLrLFwXKOXNCfAo0Kk YzPkE+ttS7fEY6/lXo6/L8+8nncbDUCThfQOpN3GhnJSpLhLS/7CR8+3I60VBJU/2Cn8 lzTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=YA3p4eZ27kBAmptCpOS+nsvy69bweIx+1O3zQnoMBQo=; b=tcbdNPLBlvuvqxtN3C+AMqKsruk6DFofwI3dGEKuBC3d41+8pHuFuoRdc8dlWtJI6z y6qLMhAE/2s0TP+k9Pja/CNTt6zCQKn0HGlIX394A1CtMtmu//09JwqYZmlBPZK4kaD+ sgYwTRa53DBaONJIDniAp0JvZ6Sr/qv+xlU5uk++OLmHV8EnRDy7QqOEV7VDCtQchFhM 6G6Ceb5qkdd2PAsbF2iO2BUgRGCVaSLC3umaPamrwIj0f4wQ3RZ31p4H03g8PwZFdjW+ MXEYO6IF20Tzgk4DZvnh3U/vorSEidKbLzEl7gFIy5kbZAUhLVJ4eBbnmniyDd4FcCKr UtEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="qIcwx0y/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r15-20020a05640251cf00b0045a3b951e8bsi10949702edd.194.2022.11.21.16.20.39; Mon, 21 Nov 2022 16:21:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="qIcwx0y/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232069AbiKVAL7 (ORCPT + 99 others); Mon, 21 Nov 2022 19:11:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbiKVALu (ORCPT ); Mon, 21 Nov 2022 19:11:50 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 241D6B4806 for ; Mon, 21 Nov 2022 16:11:50 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id e15-20020a5b0ccf000000b006ed1704b40cso2811850ybr.5 for ; Mon, 21 Nov 2022 16:11:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=YA3p4eZ27kBAmptCpOS+nsvy69bweIx+1O3zQnoMBQo=; b=qIcwx0y/rn5zB6cQ9qMsMkZjvI5gpRES2VmQc7R5/U0FH5cNytRN8b6HgZWP3lqmhc 3L11/ejja/s1KmjigNlyciVn59RY0Tzyx4JFjENh/0tSrdO7la6uMQQ8fYABbxTF1cpP g2Z2Be+xQdwbxhEQ7k8eTL1ABOQIOxL4R/CclCu1ZWnwkXM62+Uxy+O97ODM1T+MYf5k QLbEfwwu37ZtEy//NZ/93+KtTDebZ9CYFqXpucRX5IthEnNuoaywD6RGBzV0Q/sbY2sk gsEmMRnRuI9fa4JFwG1mu7Jpzq7Qt6+e7rBI0VNZHyaiZjsDYdavm5iF0NnMdBOrHWaW eybQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YA3p4eZ27kBAmptCpOS+nsvy69bweIx+1O3zQnoMBQo=; b=IsNlvQTLh2m+XAUy4T15YOPG+UoNBqKnC5vwxGini7tuTkQcaiHd1A4H+sWFrXeBQ6 r8iM5TWDuAmIjtp8Pti7oM7tze7CSbnMcap6v95mWWL2HRxT3BH/g6m/tT4EMyd5FX9p /r8/UqM0IX8aFG+PxmJpSeeC0LgMKfS/OoqXIcYsj7bWruH5R05yELxDV7GtDmUMlcxM TqQBd7EdVF25QPVb25+l9IReS6ak53dPZElOl/47Hz8mOhQpvIi/gLRXk6uWxVQhVeyj p/xB823ZDgSUiht1sJd5yAJpZ/YXKeX1cTVcwiysCnDPcU1DYSsByENVjzGnpJfE7iAM qbYQ== X-Gm-Message-State: ANoB5pmGNfdF57Sk7DnHcefplmQ7GAiEL7oeBgInuWh8b8CkW8K/Cani 2dan4LDqsAUiNrIlN8Qwlg9MP5zgjyzY X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:2107:a1f5:8582:5608]) (user=irogers job=sendgmr) by 2002:a25:4288:0:b0:6dd:39f6:da9 with SMTP id p130-20020a254288000000b006dd39f60da9mr10107180yba.509.1669075909376; Mon, 21 Nov 2022 16:11:49 -0800 (PST) Date: Mon, 21 Nov 2022 16:11:22 -0800 In-Reply-To: <20221122001125.765003-1-irogers@google.com> Message-Id: <20221122001125.765003-2-irogers@google.com> Mime-Version: 1.0 References: <20221122001125.765003-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Subject: [PATCH v2 1/4] tools lib subcmd: Add install target From: Ian Rogers To: Josh Poimboeuf , Peter Zijlstra , Nathan Chancellor , Nick Desaulniers , Tom Rix , Masahiro Yamada , Nicolas Schier , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Cc: Stephane Eranian , Andrii Nakryiko , Jiri Olsa , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750153521621906129?= X-GMAIL-MSGID: =?utf-8?q?1750153521621906129?= This allows libsubcmd to be installed as a dependency. Signed-off-by: Ian Rogers --- tools/lib/subcmd/Makefile | 49 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile index 8f1a09cdfd17..e96566f8991c 100644 --- a/tools/lib/subcmd/Makefile +++ b/tools/lib/subcmd/Makefile @@ -17,6 +17,15 @@ RM = rm -f MAKEFLAGS += --no-print-directory +INSTALL = install + +# Use DESTDIR for installing into a different root directory. +# This is useful for building a package. The program will be +# installed in this directory as if it was the root directory. +# Then the build tool can move it later. +DESTDIR ?= +DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' + LIBFILE = $(OUTPUT)libsubcmd.a CFLAGS := -ggdb3 -Wall -Wextra -std=gnu99 -fPIC @@ -48,6 +57,18 @@ CFLAGS += $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) SUBCMD_IN := $(OUTPUT)libsubcmd-in.o +ifeq ($(LP64), 1) + libdir_relative = lib64 +else + libdir_relative = lib +endif + +prefix ?= +libdir = $(prefix)/$(libdir_relative) + +# Shell quotes +libdir_SQ = $(subst ','\'',$(libdir)) + all: export srctree OUTPUT CC LD CFLAGS V @@ -61,6 +82,34 @@ $(SUBCMD_IN): FORCE $(LIBFILE): $(SUBCMD_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(SUBCMD_IN) +define do_install_mkdir + if [ ! -d '$(DESTDIR_SQ)$1' ]; then \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$1'; \ + fi +endef + +define do_install + if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ + fi; \ + $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2' +endef + +install_lib: $(LIBFILE) + $(call QUIET_INSTALL, $(LIBFILE)) \ + $(call do_install_mkdir,$(libdir_SQ)); \ + cp -fpR $(LIBFILE) $(DESTDIR)$(libdir_SQ) + +install_headers: + $(call QUIET_INSTALL, headers) \ + $(call do_install,exec-cmd.h,$(prefix)/include/subcmd,644); \ + $(call do_install,help.h,$(prefix)/include/subcmd,644); \ + $(call do_install,pager.h,$(prefix)/include/subcmd,644); \ + $(call do_install,parse-options.h,$(prefix)/include/subcmd,644); \ + $(call do_install,run-command.h,$(prefix)/include/subcmd,644); + +install: install_lib install_headers + clean: $(call QUIET_CLEAN, libsubcmd) $(RM) $(LIBFILE); \ find $(or $(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)