From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 9D760398B858 for ; Fri, 28 May 2021 19:27:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9D760398B858 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 7A1411161E6; Fri, 28 May 2021 15:27:46 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id N93WimHfiGUK; Fri, 28 May 2021 15:27:46 -0400 (EDT) Received: from murgatroyd.Home (75-166-146-111.hlrn.qwest.net [75.166.146.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 380161161E0; Fri, 28 May 2021 15:27:46 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 5/5] Remove some gdb/data-directory special cases Date: Fri, 28 May 2021 13:27:43 -0600 Message-Id: <20210528192743.508390-6-tromey@adacore.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210528192743.508390-1-tromey@adacore.com> References: <20210528192743.508390-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 19:27:48 -0000 I found an odd special case for data-directory in gdb's Makefile. I don't see a reason to have this, so this removes it in favor of having this code work in the most ordinary way for a subdirectory build. gdb/ChangeLog 2021-05-28 Tom Tromey * Makefile.in (all-data-directory): Remove. (data-directory/Makefile): Remove. --- gdb/ChangeLog | 5 +++++ gdb/Makefile.in | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 06c2da5dcf8..d76cbf235b8 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1885,11 +1885,6 @@ ifneq ($(CODESIGN_CERT),) $(ECHO_SIGN) $(CODESIGN) -s $(CODESIGN_CERT) gdb$(EXEEXT) endif -# Convenience rule to handle recursion. -.PHONY: all-data-directory -all-data-directory: data-directory/Makefile - @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=data-directory subdir_do - # This is useful when debugging GDB, because some Unix's don't let you run GDB # on itself without copying the executable. So "make gdb1" will make # gdb and put a copy in gdb1, and you can run it with "gdb gdb1". @@ -1989,9 +1984,6 @@ subdir_do: force Makefile: Makefile.in config.status $(SHELL) config.status $@ -data-directory/Makefile: data-directory/Makefile.in config.status - $(SHELL) config.status $@ - .PHONY: run run: Makefile ./gdb$(EXEEXT) --data-directory=`pwd`/data-directory $(GDBFLAGS) -- 2.26.3