From patchwork Fri Jan 18 02:28:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10769325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6697F6C5 for ; Fri, 18 Jan 2019 02:41:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 520102EF7D for ; Fri, 18 Jan 2019 02:41:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45DA62EF9D; Fri, 18 Jan 2019 02:41:19 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 023CD2EF7D for ; Fri, 18 Jan 2019 02:41:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EBBC5211B85DE; Thu, 17 Jan 2019 18:41:18 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E3AED211B509C for ; Thu, 17 Jan 2019 18:41:17 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jan 2019 18:41:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,489,1539673200"; d="scan'208";a="110789847" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga008.jf.intel.com with ESMTP; 17 Jan 2019 18:41:17 -0800 Subject: [ndctl PATCH v2] ndctl/build: Fix config.h dependency From: Dan Williams To: vishal.l.verma@intel.com Date: Thu, 17 Jan 2019 18:28:40 -0800 Message-ID: <154777834064.2059786.4819511575939860855.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvdimm@lists.01.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The config.h file needs to be rebuilt whenever ndctl/Makefile.am changes, not the top-level Makefile. This fixes some missed rebuild events when adding more definitions. This also concatenates the commands into one $(AM_V_GEN) statement so that there is only one "GEN config.h" line in the build output. Reported-by: Dave Jiang Signed-off-by: Dan Williams --- Changes in v2: * While the previous fix appeared to work it didn't when I did the same for daxctl. Then I found what was actually wrong is that we were looking at the wrong level of the directory hierarchy for Makefile.am. * I also noticed that the build output emitted "GEN config.h" multiple times. ndctl/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ndctl/Makefile.am b/ndctl/Makefile.am index f96f08974aa6..c7c1ac6ebef6 100644 --- a/ndctl/Makefile.am +++ b/ndctl/Makefile.am @@ -4,9 +4,9 @@ bin_PROGRAMS = ndctl DISTCLEANFILES = config.h BUILT_SOURCES = config.h -config.h: Makefile - $(AM_V_GEN) echo "/* Autogenerated by ndctl/Makefile.am */" >$@ - $(AM_V_GEN) echo '#define NDCTL_CONF_FILE \ +config.h: $(srcdir)/Makefile.am + $(AM_V_GEN) echo "/* Autogenerated by ndctl/Makefile.am */" >$@ && \ + echo '#define NDCTL_CONF_FILE \ "$(ndctl_monitorconfdir)/$(ndctl_monitorconf)"' >>$@ ndctl_SOURCES = ndctl.c \