From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8019 invoked by alias); 2 Jul 2018 20:18:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 7873 invoked by uid 89); 2 Jul 2018 20:18:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.148.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 02 Jul 2018 20:18:41 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 87FCB2833C3 for ; Mon, 2 Jul 2018 15:18:40 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id a5HHfK1Ay79N3a5HOfjHPV; Mon, 02 Jul 2018 15:18:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QWHqfKyjDCeIyKPaWUAv15TKX/tAvNw/p5Y6vKgVryw=; b=qugMT/6WdLw2YfjFwM/QpeWgWp 5JUKsjFvASPOGa/Hf6Mp5XialEa/x7Cl6ymbZSQYVzFoul0MxusMYcvvI5rHCR6syQe/1LXQOMW0m D55PJyBWH+xuo+xWpxu3zWPlC; Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:46962 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fa5HH-0049YK-DB; Mon, 02 Jul 2018 15:18:27 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 03/10] Simplify INIT_FILES Date: Mon, 02 Jul 2018 20:18:00 -0000 Message-Id: <20180702201824.15005-4-tom@tromey.com> In-Reply-To: <20180702201824.15005-1-tom@tromey.com> References: <20180702201824.15005-1-tom@tromey.com> X-SW-Source: 2018-07/txt/msg00028.txt.bz2 This simplifies the INIT_FILES variable. COMMON_OBS includes CONFIG_OBS and SUBDIR_GCC_COMPILE_OBS, so there's no need to reference CONFIG_OBS or SUBDIR_GCC_COMPILE_SRCS there. Once this is done, it it clear that duplicates can't occur, so remove the duplicate-removing code as well. 2018-07-01 Tom Tromey * Makefile.in (INIT_FILES): Remove CONFIG_SRCS, SUBDIR_GCC_COMPILE_SRCS. --- gdb/ChangeLog | 5 +++++ gdb/Makefile.in | 14 ++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 180f16c7b8d..b35ca2e7aef 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1848,11 +1848,7 @@ test-cp-name-parser$(EXEEXT): test-cp-name-parser.o $(LIBIBERTY) # automatically adds the $(srcdir) prefixes when it encounters files # in sub-directories such as cli/ and mi/. -# NOTE: cagney/2004-02-08: The ``case "$$fs" in'' eliminates -# duplicates. Files in the gdb/ directory can end up appearing in -# COMMON_OBS (as a .o file) and CONFIG_SRCS (as a .c file). - -INIT_FILES = $(COMMON_OBS) $(CONFIG_SRCS) $(SUBDIR_GCC_COMPILE_SRCS) +INIT_FILES = $(COMMON_OBS) init.c: $(INIT_FILES) @$(ECHO_INIT_C) echo "Making init.c" @rm -f init.c-tmp init.l-tmp @@ -1868,16 +1864,10 @@ init.c: $(INIT_FILES) -e '/version.[co]$$/d' \ -e '/^[a-z0-9A-Z_]*_[SU].[co]$$/d' \ -e 's/-exp\.o$$/-exp.y/' \ - -e 's/\.[co]$$/.c/' \ + -e 's/\.o$$/.c/' \ -e 's|^\([^ /][^ ]*\)|$(srcdir)/\1|g' | \ while read f; do \ sed -n -e 's/^_initialize_\([a-z_0-9A-Z]*\).*/\1/p' $$f 2>/dev/null; \ - done | \ - while read f; do \ - case " $$fs " in \ - *" $$f "* ) ;; \ - * ) echo $$f ; fs="$$fs $$f";; \ - esac; \ done >> init.l-tmp @echo '/* Do not modify this file. */' >>init.c-tmp @echo '/* It is created automatically by the Makefile. */'>>init.c-tmp -- 2.13.6