gdb/

	* config/djgpp/fnchange.lst: Remove entries for gdb.gdbserver.
gdb/testsuite/
	* Makefile.in (ALL_SUBDIRS): Replace gdb.gdbserver with
	gdb.server.
	* configure.ac: Likewise.
	* configure: Regenerated.
	* gdb.gdbserver/Makefile.in: Moved to...
	* gdb.server/Makefile.in: ... here.
	* gdb.gdbserver/server.c: Moved to...
	* gdb.server/server.c: ... here.
	* gdb.gdbserver/server-run.exp: Moved to...
	* gdb.server/server-run.exp: ... here.

9 files changed, 21 insertions, 7 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 315abf2..482b9b7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* config/djgpp/fnchange.lst: Remove entries for gdb.gdbserver.
+
 2005-04-10  Mark Kettenis  <kettenis@gnu.org>
 
 	* rs6000-tdep.c (ppc_supply_fpregset): Increment offset by 8 for
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index c2b60ba..70f42e2 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -206,9 +206,6 @@
 @V@/gdb/testsuite/gdb.base/coremaker2.c @V@/gdb/testsuite/gdb.base/core2maker.c
 @V@/gdb/testsuite/gdb.cp/m-static1.cc @V@/gdb/testsuite/gdb.cp/m-stat1.cc
 @V@/gdb/testsuite/gdb.cp/namespace1.cc @V@/gdb/testsuite/gdb.cp/namesp1.cc
-@V@/gdb/testsuite/gdb.gdbserver/Makefile.in @V@/gdb/testsuite/gdb.srv/Makefile.in
-@V@/gdb/testsuite/gdb.gdbserver/server-run.exp @V@/gdb/testsuite/gdb.srv/server-run.exp
-@V@/gdb/testsuite/gdb.gdbserver/server.c @V@/gdb/testsuite/gdb.srv/server.c
 @V@/gdb/testsuite/gdb.gdbtk/ChangeLog @V@/gdb/testsuite/gdb.tk/ChangeLog
 @V@/gdb/testsuite/gdb.gdbtk/Makefile.in @V@/gdb/testsuite/gdb.tk/Makefile.in
 @V@/gdb/testsuite/gdb.gdbtk/browser.exp @V@/gdb/testsuite/gdb.tk/browser.exp
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7e062f3..ba5909b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,18 @@
 2005-04-08  Daniel Jacobowitz  <dan@codesourcery.com>
 
+	* Makefile.in (ALL_SUBDIRS): Replace gdb.gdbserver with
+	gdb.server.
+	* configure.ac: Likewise.
+	* configure: Regenerated.
+	* gdb.gdbserver/Makefile.in: Moved to...
+	* gdb.server/Makefile.in: ... here.
+	* gdb.gdbserver/server.c: Moved to...
+	* gdb.server/server.c: ... here.
+	* gdb.gdbserver/server-run.exp: Moved to...
+	* gdb.server/server-run.exp: ... here.
+
+2005-04-08  Daniel Jacobowitz  <dan@codesourcery.com>
+
 	* Makefile.in (ALL_SUBDIRS): Add gdb.gdbserver.
 	* configure.ac: Create gdb.gdbserver/Makefile.
 	* configure: Regenerated.
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index dedfe95..b92b916 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -38,7 +38,7 @@ SUBDIRS = @subdirs@
 RPATH_ENVVAR = @RPATH_ENVVAR@
 ALL_SUBDIRS = gdb.ada gdb.arch gdb.asm gdb.base gdb.cp gdb.disasm \
 	gdb.dwarf2 \
-	gdb.fortran gdb.gdbserver gdb.java gdb.mi \
+	gdb.fortran gdb.server gdb.java gdb.mi \
 	gdb.objc gdb.threads gdb.trace \
 	$(SUBDIRS)
 
diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
index 72734f5..fbf77b5 100755
--- a/gdb/testsuite/configure
+++ b/gdb/testsuite/configure
@@ -3075,7 +3075,7 @@ done
 
 
 
-                                                                                                                                                      ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.gdbserver/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"
+                                                                                                                                                      ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -3635,7 +3635,7 @@ do
   "gdb.disasm/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.disasm/Makefile" ;;
   "gdb.dwarf2/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.dwarf2/Makefile" ;;
   "gdb.fortran/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.fortran/Makefile" ;;
-  "gdb.gdbserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.gdbserver/Makefile" ;;
+  "gdb.server/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.server/Makefile" ;;
   "gdb.java/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.java/Makefile" ;;
   "gdb.mi/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.mi/Makefile" ;;
   "gdb.objc/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.objc/Makefile" ;;
diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac
index 814ee8a..0c89789 100644
--- a/gdb/testsuite/configure.ac
+++ b/gdb/testsuite/configure.ac
@@ -112,6 +112,6 @@ AC_OUTPUT([Makefile \
   gdb.ada/Makefile \
   gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
   gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
-  gdb.fortran/Makefile gdb.gdbserver/Makefile \
+  gdb.fortran/Makefile gdb.server/Makefile \
   gdb.java/Makefile gdb.mi/Makefile \
   gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile])
diff --git a/gdb/testsuite/gdb.gdbserver/Makefile.in b/gdb/testsuite/gdb.server/Makefile.in
index 0633edf..0633edf 100644
--- a/gdb/testsuite/gdb.gdbserver/Makefile.in
+++ b/gdb/testsuite/gdb.server/Makefile.in
diff --git a/gdb/testsuite/gdb.gdbserver/server-run.exp b/gdb/testsuite/gdb.server/server-run.exp
index e0085dc..e0085dc 100644
--- a/gdb/testsuite/gdb.gdbserver/server-run.exp
+++ b/gdb/testsuite/gdb.server/server-run.exp
diff --git a/gdb/testsuite/gdb.gdbserver/server.c b/gdb/testsuite/gdb.server/server.c
index b651263..b651263 100644
--- a/gdb/testsuite/gdb.gdbserver/server.c
+++ b/gdb/testsuite/gdb.server/server.c