From patchwork Mon Jul 2 20:18:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 28203 Received: (qmail 9006 invoked by alias); 2 Jul 2018 20:18:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 8445 invoked by uid 89); 2 Jul 2018 20:18:46 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 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: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.143.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 02 Jul 2018 20:18:44 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway31.websitewelcome.com (Postfix) with ESMTP id C0D45305CA for ; Mon, 2 Jul 2018 15:18:42 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id a5HJfK1Jj79N3a5HRfjHZh; Mon, 02 Jul 2018 15:18:42 -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=pexgz3Ysf8cnKNp97VpKktHCjPMtm3VwqT7sxVhl2w4=; b=UxmgylIaLmWW0tcqG/GvaZmbYN hKNL0TG4FAl7qU7aV+PppmC2hptpaNhUh3qFecTklHfvu4ESZrFQk/FJA2XmYH2sHimeJpKJeIV7F 0IsumTas4ZW7BNBzOhzqariBO; 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 1fa5HJ-0049YK-4B; Mon, 02 Jul 2018 15:18:29 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 09/10] Remove ADD_FILES and ADD_DEPS from Makefile.in Date: Mon, 2 Jul 2018 14:18:23 -0600 Message-Id: <20180702201824.15005-10-tom@tromey.com> In-Reply-To: <20180702201824.15005-1-tom@tromey.com> References: <20180702201824.15005-1-tom@tromey.com> Nothing defines XM_ADD_FILES, TM_ADD_FILES, or NAT_ADD_FILES any more, so consequently ADD_FILES and ADD_DEPS are no longer needed. So, this removes them. gdb/ChangeLog 2018-07-02 Tom Tromey * Makefile.in (ADD_FILES, ADD_DEPS): Remove. (LIBGDB_OBS, clean mostlyclean): Update. (gdb$(EXEEXT), insight$(EXEEXT)): Update. --- gdb/ChangeLog | 6 ++++++ gdb/Makefile.in | 12 ++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 36d2c44a2a1..a140fc24a41 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -603,9 +603,6 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(ZLIB) $(INTL) $(LIBIBERTY) $(LIBD CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) -ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) -ADD_DEPS = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) - DIST = gdb RUNTEST = runtest @@ -1882,14 +1879,14 @@ stamp-init: $(INIT_FILES) # against that. # # init.o is very important. It pulls in the rest of GDB. -LIBGDB_OBS = $(COMMON_OBS) $(ADD_FILES) init.o +LIBGDB_OBS = $(COMMON_OBS) init.o libgdb.a: $(LIBGDB_OBS) -rm -f libgdb.a $(AR) q libgdb.a $(LIBGDB_OBS) $(RANLIB) libgdb.a # Removing the old gdb first works better if it is running, at least on SunOS. -gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS) +gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(CDEPS) $(TDEPLIBS) $(SILENCE) rm -f gdb$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ -o gdb$(EXEEXT) gdb.o $(LIBGDB_OBS) \ @@ -1940,7 +1937,7 @@ tags: TAGS clean mostlyclean: $(CONFIG_CLEAN) @$(MAKE) $(FLAGS_TO_PASS) DO=clean "DODIRS=$(CLEANDIRS)" subdir_do - rm -f *.o *.a $(ADD_FILES) *~ init.c-tmp init.l-tmp version.c-tmp + rm -f *.o *.a *~ init.c-tmp init.l-tmp version.c-tmp rm -f init.c stamp-init version.c stamp-version rm -f gdb$(EXEEXT) core make.log rm -f gdb[0-9]$(EXEEXT) @@ -2572,8 +2569,7 @@ clean-gdbtk: rm -f insight$(EXEEXT) # Removing the old gdb first works better if it is running, at least on SunOS. -insight$(EXEEXT): gdbtk-main.o libgdb.a $(ADD_DEPS) \ - $(CDEPS) $(TDEPLIBS) +insight$(EXEEXT): gdbtk-main.o libgdb.a $(CDEPS) $(TDEPLIBS) rm -f insight$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ -o insight$(EXEEXT) gdbtk-main.o libgdb.a \