From 8f713fdfeb3bde6fe89dfb300f22cae9778e35eb Mon Sep 17 00:00:00 2001
From: dzu <dzu>
Date: Thu, 7 Aug 2003 14:20:31 +0000
Subject: [PATCH] Removed tools/gdb from "make all" target.  Added make target
 "gdbtools" in toplevel directory instead.  Removed astest.c from tools/gdb
 because it is no longer relevant.

---
 Makefile           |  3 +++
 tools/Makefile     |  8 +-------
 tools/gdb/Makefile | 10 +---------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index c4bb10c..249a067 100644
--- a/Makefile
+++ b/Makefile
@@ -148,6 +148,9 @@ u-boot:		depend subdirs $(OBJS) $(LIBS) $(LDSCRIPT)
 subdirs:
 		@for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir || exit 1 ; done
 
+gdbtools:
+		$(MAKE) -C tools/gdb || exit 1
+
 depend dep:
 		@for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir .depend ; done
 
diff --git a/tools/Makefile b/tools/Makefile
index de6f7dd..ac35ee3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2000, 2001
+# (C) Copyright 2000-2003
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -65,16 +65,11 @@ TOOLSUBDIRS =
 # -multiply_defined suppress option to turn off this error.
 #
 ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
-TOOLSUBDIRS+= gdb
 HOST_CFLAGS = -traditional-cpp -Wall
 HOST_LDFLAGS =-multiply_defined suppress
 HOST_ENVIRO_CFLAGS = -traditional-cpp
 
 else
-#
-# The gdb tools won't build natively on NetBSD since bfd.h (and ansidecl.h)
-# are not installed -- just skip them, they are not really essential.
-#
 ifeq ($(HOSTOS)-$(HOSTARCH),netbsd-ppc)
 HOST_CFLAGS = -Wall -pedantic
 HOST_LDFLAGS =
@@ -84,7 +79,6 @@ HOST_ENVIRO_CFLAGS =
 # Everyone else
 #
 else
-TOOLSUBDIRS+= gdb
 HOST_CFLAGS = -Wall -pedantic
 HOST_LDFLAGS =
 HOST_ENVIRO_CFLAGS =
diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile
index 1b66390..faff120 100644
--- a/tools/gdb/Makefile
+++ b/tools/gdb/Makefile
@@ -25,12 +25,7 @@ include $(TOPDIR)/config.mk
 
 BINS	= gdbsend gdbcont
 
-ifneq ($(HOSTOS),HP-UX)
-BINS+= astest
-endif
-
-
-OBJS	= gdbsend.o gdbcont.o astest.o error.o remote.o serial.o
+OBJS	= gdbsend.o gdbcont.o error.o remote.o serial.o
 
 #
 # Use native tools and options
@@ -57,9 +52,6 @@ gdbsend:	gdbsend.o error.o remote.o serial.o
 gdbcont:	gdbcont.o error.o remote.o serial.o
 		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
 
-astest:		astest.o error.o
-		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ -L$(BFD_ROOT_DIR)/lib -lbfd -liberty
-
 clean:
 	rm -f $(OBJS)