From patchwork Sun Aug 13 19:10:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Li X-Patchwork-Id: 9898009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BFD4760351 for ; Sun, 13 Aug 2017 19:10:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B15B82623D for ; Sun, 13 Aug 2017 19:10:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A63EC28599; Sun, 13 Aug 2017 19:10:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39EFD2623D for ; Sun, 13 Aug 2017 19:10:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751150AbdHMTKl (ORCPT ); Sun, 13 Aug 2017 15:10:41 -0400 Received: from mail-yw0-f194.google.com ([209.85.161.194]:33503 "EHLO mail-yw0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751025AbdHMTKk (ORCPT ); Sun, 13 Aug 2017 15:10:40 -0400 Received: by mail-yw0-f194.google.com with SMTP id u207so5090266ywc.0 for ; Sun, 13 Aug 2017 12:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to:cc; bh=goAHZYlK+CLQCr6eElwZziABAm6+UcO660DE/VOGsLQ=; b=PaWa4g1ZutI2QUl5xLLurIE/Oqs36gUOOwz/PFelxXXUY0M8663gIeR+WOHotj/XAG Ej/IJdbGMTBkze/4v9oDf9YeqNB5+ivtaQ4wxwwhmSpPiZPvuym+82e4hRxpOEo4UoEK 4A8AiLQSUCQWRGbNZ/nfA4Ek0fsWWelydM5TBqyEZ1FB18jcjb4LPMLLfzKxEVmp0V2l +fVZvGg/ax0+vcr3sdU+4t+ekKd5+G6fOnF902pK8LPi1Ex6X58WlGHHI6iOKA92pVH2 aZsfXw9Tc19IbD3xdp4zYDBebXzJoSLSVWuHbidW0qGnHF1Pj4T6c7PlD3Q9RUEJZy5F ADrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to:cc; bh=goAHZYlK+CLQCr6eElwZziABAm6+UcO660DE/VOGsLQ=; b=adj+P7b0Yw/cn9+S2wQIPb23NsGnY5TApkeZskqHblhBKcP9VBhBoYzHcfmRDEyAtq JFCuY7jSfvmVUsu4MN3aoBnYdiRY/GqcsnGYNgl2CXU3YsGfaJARVlLQSsGnlpJAVAOH +X+L2qyIhE/9aXkOwJFUeIm203nhj/HLH0s/9UehaYlh+SOf6cf6pSphVk05H6T+t5Ii QCiRM0qh34CDfEpfdxvBbhfO0yRbBIDDfKLqOeFqd4YJhlZIo6rHZevQW85xjHWWr2Pv ZsJmnlbOFJfqCKARaMzVhtW10zQq5uLqdIPFZEJsu8CisFCLLGDnzGRAOkQFg9tctvVo xXxg== X-Gm-Message-State: AHYfb5jJyV6bk6Op6LFdLUD6HRW+bx5SvplZfuLxiXfpVwAAmf6ajezw 6FYVS3NS+JRH1Jhk2ZVR6VI6JpMiRrAj X-Received: by 10.129.229.4 with SMTP id s4mr18037307ywl.130.1502651440239; Sun, 13 Aug 2017 12:10:40 -0700 (PDT) MIME-Version: 1.0 Received: by 10.129.68.39 with HTTP; Sun, 13 Aug 2017 12:10:39 -0700 (PDT) From: Christopher Li Date: Sun, 13 Aug 2017 15:10:39 -0400 X-Google-Sender-Auth: lJcEGCdRdJ7MIQ7ez-4JHCS6SfQ Message-ID: Subject: [PATCH 3/4] Makefile: rename debug/sparse as sparse-dbg during To: Linux-Sparse Cc: Luc Van Oostenryck Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP debug/sparse have conflict with release version of sparse on install target. Rename debug/sparse as sparse-dbg during install. Signed-off-by: Christopher Li --- Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) @@ -194,6 +202,7 @@ install: all-installable $(Q)install -d $(DESTDIR)$(INCLUDEDIR)/sparse $(Q)install -d $(DESTDIR)$(PKGCONFIGDIR) $(foreach f,$(INST_PROGRAMS),$(call INSTALL_EXEC,$f,$(BINDIR))) + $(foreach f,$(REL_PROGRAMS),$(call INSTALL_DBG,$f,$(BINDIR))) $(foreach f,$(INST_MAN1),$(call INSTALL_FILE,$f,$(MAN1DIR))) $(foreach f,$(LIBS),$(call INSTALL_FILE,$f,$(LIBDIR))) $(foreach f,$(LIB_H),$(call INSTALL_FILE,$f,$(INCLUDEDIR)/sparse)) diff --git a/Makefile b/Makefile index 4c89e4c..9db6b15 100644 --- a/Makefile +++ b/Makefile @@ -155,10 +155,16 @@ QUIET_INST_SH = $(Q:@=echo -n ' INSTALL ';) QUIET_INST = $(Q:@=@echo -n ' INSTALL ';) define INSTALL_EXEC - $(QUIET_INST)install -v $1 $(DESTDIR)$2/$1 || exit 1; + $(QUIET_INST)install -v $1 $(DESTDIR)$2/$(notdir $1) || exit 1; endef +define INSTALL_DBG + $(QUIET_INST)install -v debug/$1 $(DESTDIR)$2/$(notdir $1)-dbg || exit 1; + +endef + + define INSTALL_FILE $(QUIET_INST)install -v -m 644 $1 $(DESTDIR)$2/$1 || exit 1; @@ -180,10 +186,12 @@ DBG_LIBS := $(DBG_LIB_FILE) REL_OBJS := $(LIB_OBJS) $(foreach @F,$(PROGRAMS),$(@F).o $(EXTRA_OBJS)) DBG_OBJS := $(DBG_LIB_OBJS) $(foreach @F,$(PROGRAMS),debug/$(@F).o $(EXTRA_OBJS)) ALL_OBJS := $(REL_OBJS) $(DBG_OBJS) -INST_PROGRAMS += $(PROGRAMS) $(DBG_PROGRAMS) +ALL_PROGRAMS := $(REL_PROGRAMS) $(DBG_PROGRAMS) +INST_PROGRAMS += $(REL_PROGRAMS) \ + $(filter-out $(addprefix debug/,$(REL_PROGRAMS)),$(DBG_PROGRAMS)) -all: $(REL_PROGRAMS) $(DBG_PROGRAMS) sparse.pc +all: $(ALL_PROGRAMS) sparse.pc all-installable: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc