Remove some gdb/data-directory special cases

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-06-01  Tom Tromey  <tromey@adacore.com>

	* Makefile.in (all-data-directory): Remove.
	(data-directory/Makefile): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 87e2a13fcc4ecd03f28eb7166e5a3bfbd92d7a5b..1ca03b4e17a5d4ba39be8fabc4ae8cf7ac22cb53 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-01  Tom Tromey  <tromey@adacore.com>
+
+       * Makefile.in (all-data-directory): Remove.
+       (data-directory/Makefile): Remove.
+
 2021-06-01  Tom Tromey  <tromey@adacore.com>
 
        * configure: Rebuild.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f66f437f4f3165aecb6ee323df769aa33f4d5cf1..f664d964536d630b8b8e66b85901a066e93b8fe1 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1886,11 +1886,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".
@@ -1990,9 +1985,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)