[src/trunk]: src/gnu/usr.bin/gdb Now that the old toolchain is gone, rename g...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c1a0d8cf9f31
branches:  trunk
changeset: 536809:c1a0d8cf9f31
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sun Sep 22 12:58:23 2002 +0000

description:
Now that the old toolchain is gone, rename gdb.new to gdb, as requested
in a comment in gdb.new's Makefile. Remove that comment.

diffstat:

 gnu/usr.bin/gdb/Makefile         |   4 +-
 gnu/usr.bin/gdb/gdb.new/Makefile |  58 ----------------------------------------
 gnu/usr.bin/gdb/gdb/Makefile     |  55 +++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 60 deletions(-)

diffs (132 lines):

diff -r 525199d2e1cc -r c1a0d8cf9f31 gnu/usr.bin/gdb/Makefile
--- a/gnu/usr.bin/gdb/Makefile  Sun Sep 22 10:31:16 2002 +0000
+++ b/gnu/usr.bin/gdb/Makefile  Sun Sep 22 12:58:23 2002 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile,v 1.52 2002/09/16 16:24:22 thorpej Exp $
+#      $NetBSD: Makefile,v 1.53 2002/09/22 12:58:23 wiz Exp $
 
-SUBDIR=                gdb.new # gdbreplay gdbserver
+SUBDIR=                gdb # gdbreplay gdbserver
 
 .include <bsd.subdir.mk>
diff -r 525199d2e1cc -r c1a0d8cf9f31 gnu/usr.bin/gdb/gdb.new/Makefile
--- a/gnu/usr.bin/gdb/gdb.new/Makefile  Sun Sep 22 10:31:16 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#      $NetBSD: Makefile,v 1.10 2002/09/19 03:09:36 lukem Exp $
-
-# XXX - This gdb.new directory should be renamed to "gdb" after all platforms
-# have been migrated to the new toolchain.
-
-.include <bsd.own.mk>
-
-.if ${MKGDB} != "no" && ${MKBFD} != "no" && \
-    exists(${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk)
-
-TOP=           ${NETBSDSRCDIR}/gnu
-DIST=          ${TOP}/dist/toolchain
-
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
-
-PROG=          gdb
-
-SRCS=          ${G_LIBGDB_OBS:.o=.c} ${G_OBJECTS:Nxmalloc.o:.o=.c} ${G_SIM_OBS:.o=.c} main.c
-CPPFLAGS=      -I${.CURDIR}/../arch/${MACHINE_ARCH} \
-               ${G_INTERNAL_CFLAGS:M-[ID]*:N*readline*:N*intl*:N-I.*} \
-               ${G_CCFLAGS:M-DRL_*} \
-               -I${TOP}/lib/libbfd/arch/${MACHINE_ARCH}
-
-LDADD=         -ltermcap -lintl -lm -lkvm
-DPADD=         ${LIBTERMCAP} ${LIBINTL} ${LIBM} ${LIBKVM}
-
-TEXINFO=       gdb.texinfo gdbint.texinfo stabs.texinfo
-INFOFLAGS=     -I${DIST}/gdb/doc -I${DIST}/gdb/mi \
-               -I${DIST}/readline/doc -I${.CURDIR}/..
-
-.endif # MKGDB != no && MKBFD != no
-
-.include "../../Makefile.inc"
-.include <bsd.prog.mk>
-.include <bsd.info.mk>
-
-.if ${MKGDB} != "no" && ${MKBFD} != "no" && \
-    exists(${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk)
-
-BFDOBJ!=       cd ${TOP}/lib/libbfd && ${PRINTOBJDIR}
-LDADD+=                -L${BFDOBJ} -lbfd
-DPADD+=                ${BFDOBJ}/libbfd_pic.a
-
-IBERTYOBJ!=    cd ${TOP}/lib/libiberty && ${PRINTOBJDIR}
-LDADD+=                -L${IBERTYOBJ} -liberty
-DPADD+=                ${IBERTYOBJ}/libiberty.a
-
-# PSIM support for PowerPC.
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == powerpcle
-PSIMOBJ!=      cd ${TOP}/usr.bin/sim/ppc && ${PRINTOBJDIR}
-LDADD+=                -L${PSIMOBJ} -lsim
-DPADD+=                ${PSIMOBJ}/libsim.a
-.endif
-
-.PATH: ${DIST}/gdb ${DIST}/gdb/tui ${DIST}/gdb/doc \
-       ${DIST}/readline ${.CURDIR}/../arch/${MACHINE_ARCH}
-
-.endif # MKGDB != no && MKBFD != no
diff -r 525199d2e1cc -r c1a0d8cf9f31 gnu/usr.bin/gdb/gdb/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/gnu/usr.bin/gdb/gdb/Makefile      Sun Sep 22 12:58:23 2002 +0000
@@ -0,0 +1,55 @@
+#      $NetBSD: Makefile,v 1.15 2002/09/22 12:58:24 wiz Exp $
+
+.include <bsd.own.mk>
+
+.if ${MKGDB} != "no" && ${MKBFD} != "no" && \
+    exists(${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk)
+
+TOP=           ${NETBSDSRCDIR}/gnu
+DIST=          ${TOP}/dist/toolchain
+
+.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
+
+PROG=          gdb
+
+SRCS=          ${G_LIBGDB_OBS:.o=.c} ${G_OBJECTS:Nxmalloc.o:.o=.c} ${G_SIM_OBS:.o=.c} main.c
+CPPFLAGS=      -I${.CURDIR}/../arch/${MACHINE_ARCH} \
+               ${G_INTERNAL_CFLAGS:M-[ID]*:N*readline*:N*intl*:N-I.*} \
+               ${G_CCFLAGS:M-DRL_*} \
+               -I${TOP}/lib/libbfd/arch/${MACHINE_ARCH}
+
+LDADD=         -ltermcap -lintl -lm -lkvm
+DPADD=         ${LIBTERMCAP} ${LIBINTL} ${LIBM} ${LIBKVM}
+
+TEXINFO=       gdb.texinfo gdbint.texinfo stabs.texinfo
+INFOFLAGS=     -I${DIST}/gdb/doc -I${DIST}/gdb/mi \
+               -I${DIST}/readline/doc -I${.CURDIR}/..
+
+.endif # MKGDB != no && MKBFD != no
+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
+.include <bsd.info.mk>
+
+.if ${MKGDB} != "no" && ${MKBFD} != "no" && \
+    exists(${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk)
+
+BFDOBJ!=       cd ${TOP}/lib/libbfd && ${PRINTOBJDIR}
+LDADD+=                -L${BFDOBJ} -lbfd
+DPADD+=                ${BFDOBJ}/libbfd_pic.a
+
+IBERTYOBJ!=    cd ${TOP}/lib/libiberty && ${PRINTOBJDIR}
+LDADD+=                -L${IBERTYOBJ} -liberty
+DPADD+=                ${IBERTYOBJ}/libiberty.a
+
+# PSIM support for PowerPC.
+.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == powerpcle
+PSIMOBJ!=      cd ${TOP}/usr.bin/sim/ppc && ${PRINTOBJDIR}
+LDADD+=                -L${PSIMOBJ} -lsim
+DPADD+=                ${PSIMOBJ}/libsim.a
+.endif
+
+.PATH: ${DIST}/gdb ${DIST}/gdb/tui ${DIST}/gdb/doc \
+       ${DIST}/readline ${.CURDIR}/../arch/${MACHINE_ARCH}
+
+.endif # MKGDB != no && MKBFD != no