[5/5] Remove some gdb/data-directory special cases

Message ID 20210528192743.508390-6-tromey@adacore.com
State New
Headers show
Series
  • Some gdb build cleanups
Related show

Commit Message

Tom Tromey May 28, 2021, 7:27 p.m.
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  <tromey@adacore.com>

	* Makefile.in (all-data-directory): Remove.
	(data-directory/Makefile): Remove.
---
 gdb/ChangeLog   | 5 +++++
 gdb/Makefile.in | 8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)

-- 
2.26.3

Patch

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)