From 6e0465c6bc7dbced46d7b6a913a1a2495c220ccc Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 9 Mar 2003 17:03:05 +0000
Subject: [PATCH] * Makefile.in: Use "cygwin0" rather than "new-cygwin" to
 denote in-build-tree version of library or dll. * config/default.exp: Ditto.
 * winsup.api/winsup.exp: Ditto.

---
 winsup/testsuite/ChangeLog             | 7 +++++++
 winsup/testsuite/Makefile.in           | 4 ++--
 winsup/testsuite/README                | 6 +++---
 winsup/testsuite/config/default.exp    | 2 +-
 winsup/testsuite/winsup.api/winsup.exp | 2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index ee00f8091..39ec06884 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-09  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in: Use "cygwin0" rather than "new-cygwin" to denote
+	in-build-tree version of library or dll.
+	* config/default.exp: Ditto.
+	* winsup.api/winsup.exp: Ditto.
+
 2003-03-07  Corinna Vinschen  <corinna@vinschen.de>
 
 	* winsup.api/known_bugs.tcl: Remove fsync01, setregid01 and setreuid01
diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in
index 14b6ab256..9cab7d127 100644
--- a/winsup/testsuite/Makefile.in
+++ b/winsup/testsuite/Makefile.in
@@ -86,7 +86,7 @@ ifdef VERBOSE
     RUNTESTFLAGS = -v
 endif
 
-RUNTIME=$(cygwin_build)/new-cygwin1.dll $(cygwin_build)/new-libcygwin.a
+RUNTIME=$(cygwin_build)/cygwin0.dll $(cygwin_build)/libcygwin0.a
 
 TESTSUP_LIB_NAME:=libltp.a
 TESTSUP_OFILES:=${sort ${addsuffix .o,${basename ${notdir ${wildcard $(libltp_srcdir)/lib/*.c}}}}}
@@ -173,7 +173,7 @@ testsuite/site.exp: site.exp
 	rm -rf testsuite/site.exp
 	cp site.exp testsuite/site.exp
 
-# Note: we set the PATH so that we can pick up new-cygwin1.dll
+# Note: we set the PATH so that we can pick up cygwin0.dll
 
 check: $(TESTSUP_LIB_NAME) $(RUNTIME) cygrun.exe testsuite/site.exp
 	cd testsuite; \
diff --git a/winsup/testsuite/README b/winsup/testsuite/README
index 1f289f1b1..2f6749bb8 100644
--- a/winsup/testsuite/README
+++ b/winsup/testsuite/README
@@ -2,10 +2,10 @@
 
 Here are some notes about adding and using this testsuite.
 
-First, all the programs are linked with new-libcygwin.a, which is just
-like libcygwin.a, except that it wants new-cygwin1.dll, not
+First, all the programs are linked with libcygwin0.a, which is just
+like libcygwin.a, except that it wants cygwin0.dll, not
 cygwin1.dll.  The testsuite adds the winsup build directory to the
-PATH so that new-cygwin1.dll can be found by windows during testing.
+PATH so that cygwin0.dll can be found by windows during testing.
 
 Because we'll probably run into complaints about using two DLLs, we
 run cygrun.exe for each test.  All this does is run the test with
diff --git a/winsup/testsuite/config/default.exp b/winsup/testsuite/config/default.exp
index 695808fc9..3936979a6 100644
--- a/winsup/testsuite/config/default.exp
+++ b/winsup/testsuite/config/default.exp
@@ -1,7 +1,7 @@
 proc winsup_version {} {
     global env
     global rootme
-    clone_output "\n[exec grep ^%%% $rootme/../cygwin/new-cygwin1.dll]\n"
+    clone_output "\n[exec grep ^%%% $rootme/../cygwin/cygwin0.dll]\n"
     if { [info exists env(CYGWIN)] } {
         clone_output "CYGWIN=$env(CYGWIN)\n"
     } else {
diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/winsup.api/winsup.exp
index ccfa7b200..26d3af0d2 100644
--- a/winsup/testsuite/winsup.api/winsup.exp
+++ b/winsup/testsuite/winsup.api/winsup.exp
@@ -48,7 +48,7 @@ foreach src [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.c] {
 	clear_xfail
     }
 
-    ws_spawn "$CC -nodefaultlibs -mwin32 $CFLAGS $src $add_includes $add_libs $runtime_root/binmode.o -lgcc $runtime_root/new-libcygwin.a -lkernel32 -luser32 -o $base.exe"
+    ws_spawn "$CC -nodefaultlibs -mwin32 $CFLAGS $src $add_includes $add_libs $runtime_root/binmode.o -lgcc $runtime_root/libcygwin0.a -lkernel32 -luser32 -o $base.exe"
     if { $rv != "" } {
 	verbose -log "$rv"
 	fail "$testcase (compile)"