Generate cordtest and de executable files in GC base folder

This is to match the behavior of Automake- and CMake-based scripts.

* BCC_MAKEFILE (all, cord\de.exe): Rename cord\de.exe to de.exe.
* NT_MAKEFILE (all, cord\de.exe): Likewise.
* doc/README.win32: Likewise.
* Makefile.direct (cord/cordtest, clean, check): Rename cord/cordtest to
cordtest.
* SMakefile.amiga (all, clean, test, cord/cordtest): Likewise.
* Makefile.direct (cord/de): Rename cord/de to de$(EXEEXT); add cord/de
rule depending on de$(EXEEXT).
* Makefile.direct (clean): Rename cord/de to de.
* doc/README.cords: Likewise.
* OS2_MAKEFILE (all, cord\cordtest.exe): Rename cord\cordtest.exe to
cordtest.exe.

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index f6398c1ddfea2e6a3ce9862962dea1ff321854dd..69436733992f39b006e4e13ffe50e841c899f2ff 100644 (file)
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -39,7 +39,7 @@ XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \
 \r
 OBJS= $(XXXOBJS:XXX=)\r
 \r
-all: gctest.exe cord\de.exe test_cpp.exe\r
+all: gctest.exe de.exe test_cpp.exe\r
 \r
 $(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h MAKEFILE\r
 \r
@@ -57,13 +57,13 @@ gctest.exe: tests\test.obj gc.lib
 cord\tests\de.obj cord\tests\de_win.obj: include\cord.h \\r
     include\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h\r
 \r
-cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj \\r
+de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj \\r
     cord\tests\de_win.obj cord\tests\de_win.res gc.lib\r
        $(cc) @&&|\r
        $(cflags) -W -e$* cord\cordbscs.obj cord\cordxtra.obj \\r
        cord\tests\de.obj cord\tests\de_win.obj gc.lib\r
 |\r
-       $(rc) cord\tests\de_win.res cord\de.exe\r
+       $(rc) cord\tests\de_win.res de.exe\r
 \r
 gc_cpp.obj: gc_cpp.cc include\gc_cpp.h include\gc.h\r
 \r

diff --git a/Makefile.direct b/Makefile.direct
index 679b518b86330b0cbe595df0b126b563f4e164e1..a203f4ea0bd6e7574c350bf4820c4b1442c07cde 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -331,24 +331,26 @@ cord/cordprnt.o: $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES)
        mkdir cord || cat /dev/null
        mv cordprnt.o cord/cordprnt.o
 
-cord/cordtest$(EXEEXT): $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) \
+cordtest$(EXEEXT): $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) \
   base_lib $(UTILS)
-       rm -f cord/cordtest$(EXEEXT)
-       ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -lucb
-       ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs`
-       ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
-       ./if_not_there cord/cordtest$(EXEEXT) || $(CC) $(CFLAGS) -o cord/cordtest$(EXEEXT) $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
+       rm -f cordtest$(EXEEXT)
+       ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -lucb
+       ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs`
+       ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
+       ./if_not_there cordtest$(EXEEXT) || $(CC) $(CFLAGS) -o cordtest$(EXEEXT) $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
 
-cord/de: $(srcdir)/cord/tests/de.c $(srcdir)/cord/tests/de_win.c \
+cord/de: de$(EXEEXT)
+
+de$(EXEEXT): $(srcdir)/cord/tests/de.c $(srcdir)/cord/tests/de_win.c \
   $(srcdir)/cord/tests/de_win.h cord/cordbscs.o cord/cordxtra.o base_lib \
   $(UTILS)
-       rm -f cord/de
-       ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses -ltermlib -lucb `./threadlibs`
-       ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses -ltermlib -ldld `./threadlibs`
-       ./if_mach POWERPC AIX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
-       ./if_mach POWERPC DARWIN $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a
-       ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
-       ./if_not_there cord/de$(EXEEXT) || $(CC) $(CFLAGS) -o cord/de$(EXEEXT) $(srcdir)/cord/tests/de.c $(srcdir)/cord/tests/de_win.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs`
+       rm -f de$(EXEEXT)
+       ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses -ltermlib -lucb `./threadlibs`
+       ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses -ltermlib -ldld `./threadlibs`
+       ./if_mach POWERPC AIX $(CC) $(CFLAGS) -o de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
+       ./if_mach POWERPC DARWIN $(CC) $(CFLAGS) -o de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a
+       ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
+       ./if_not_there de$(EXEEXT) || $(CC) $(CFLAGS) -o de$(EXEEXT) $(srcdir)/cord/tests/de.c $(srcdir)/cord/tests/de_win.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs`
 
 if_mach$(EXEEXT): $(srcdir)/tools/if_mach.c \
   $(srcdir)/include/private/gcconfig.h
@@ -364,8 +366,7 @@ if_not_there$(EXEEXT): $(srcdir)/tools/if_not_there.c
 clean:
        rm -f gc.a *.i *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
              setjmp_test mon.out gmon.out a.out core if_not_there if_mach \
-             base_lib c++ $(CORD_OBJS) cord/cordtest cord/de cords \
-             dont_ar_* threadlibs
+             base_lib c++ $(CORD_OBJS) cordtest de cords dont_ar_* threadlibs
        -rm -f *~
 
 gctest$(EXEEXT): tests/test.o base_lib $(UTILS)
@@ -382,10 +383,10 @@ setjmp_test$(EXEEXT): $(srcdir)/tools/setjmp_t.c $(srcdir)/include/gc.h \
   $(UTILS)
        $(CC) $(CFLAGS) -o setjmp_test$(EXEEXT) $(srcdir)/tools/setjmp_t.c
 
-check: cord/cordtest$(EXEEXT) gctest$(EXEEXT) setjmp_test$(EXEEXT)
+check: cordtest$(EXEEXT) gctest$(EXEEXT) setjmp_test$(EXEEXT)
        ./setjmp_test
        ./gctest
-       cord/cordtest
+       cordtest
 
 # A synonym to "check" (for compatibility with older GC versions).
 test: check

diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index 103f6fec3e9696c3c55ebcc151f9e72a1519b0fa..39c068db37b49b0924bbadca06fdf2961ac894bc 100644 (file)
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -91,7 +91,7 @@ AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
 OBJS= misc.obj win32_threads.obj alloc.obj reclaim.obj allchblk.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj gcj_mlc.obj mallocx.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
-all: gctest.exe cord\de.exe test_cpp.exe
+all: gctest.exe de.exe test_cpp.exe
 
 .c.obj:
        $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude -I$(AO_INCLUDE_DIR) $(CFLAGS_DEFAULT) -DCORD_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701
@@ -120,8 +120,8 @@ cord\tests\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cm
        $(rc) $(rcvars) -r -fo cord\tests\de_win.res cord\tests\de_win.rc
 
 # Cord/de is a real win32 GUI app.
-cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\tests\de_win.rbj $(GC_LIB)
-       $(link) /MACHINE:$(CPU) /INCREMENTAL:NO $(ldebug) $(lflags) -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\tests\de_win.rbj $(GC_LIB) gdi32.lib user32.lib
+de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\tests\de_win.rbj $(GC_LIB)
+       $(link) /MACHINE:$(CPU) /INCREMENTAL:NO $(ldebug) $(lflags) -out:de.exe cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\tests\de_win.rbj $(GC_LIB) gdi32.lib user32.lib
 
 gc_cpp.obj: gc_cpp.cc include\gc_cpp.h include\gc.h
 

diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE
index afc5c4eb2a7285fdf948360b4e6c4e0562508f9a..c0fa88984cbbdccaf5bddff85f5ecb68aca7fa0c 100644 (file)
--- a/OS2_MAKEFILE
+++ b/OS2_MAKEFILE
@@ -15,7 +15,7 @@ CFLAGS= /O /Q /DALL_INTERIOR_POINTERS /DENABLE_DISCLAIM /DGC_ATOMIC_UNCOLLECTABL
 # Setjmp_test may yield overly optimistic results when compiled
 # without optimization.
 
-all: $(OBJS) gctest.exe cord\cordtest.exe
+all: $(OBJS) gctest.exe cordtest.exe
 
 $(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h
 
@@ -41,5 +41,5 @@ cord\cordxtra.obj: cord\cordxtra.c include\cord.h include\cord_pos.h include\ec.
 cord\cordprnt.obj: cord\cordprnt.c include\cord.h include\cord_pos.h include\ec.h
         $(CC) $(CFLAGS) /C /Focord\cordprnt cord\cordprnt.c
 
-cord\cordtest.exe: cord\tests\cordtest.c include\cord.h include\cord_pos.h include\ec.h $(CORDOBJS) gc.lib
-        $(CC) $(CFLAGS) /B"/STACK:65536" /Fecord\cordtest cord\tests\cordtest.c gc.lib $(CORDOBJS)
+cordtest.exe: cord\tests\cordtest.c include\cord.h include\cord_pos.h include\ec.h $(CORDOBJS) gc.lib
+        $(CC) $(CFLAGS) /B"/STACK:65536" /Fecordtest cord\tests\cordtest.c gc.lib $(CORDOBJS)

diff --git a/SMakefile.amiga b/SMakefile.amiga
index 5e27b22a4e3dbd17d48ecf9e87d187ac4f0a5698..36cf73d7358111a18df16b5d123968985a7e7caf 100644 (file)
--- a/SMakefile.amiga
+++ b/SMakefile.amiga
@@ -49,16 +49,16 @@ CSCOPT= $(OPT) DEFINE AMIGA IGNORE=100 IGNORE=161
 #------------------LINKING----------------------------
 
 
-all: gctest setjmp_t cord/cordtest
+all: gctest setjmp_t cordtest
 
 clean:
-       delete *.lib gctest setjmp_t *.o *.lnk cord/*.o cord/*.lib cord/*.lnk cord/cordtest
+       delete *.lib gctest setjmp_t *.o *.lnk cord/*.o cord/*.lib cord/*.lnk cordtest
        smake
 
-test: setjmp_t gctest cord/cordtest
+test: setjmp_t gctest cordtest
        setjmp_t
        gctest
-       cord/cordtest
+       cordtest
 
 gctest: gc$(CPU).lib GCAmigaOS$(CPU).lib test.o
        $(LINKER) LIB:c.o test.o TO gctest LIB gc$(CPU).lib LIB:sc.lib $(MATHLIB)
@@ -66,8 +66,8 @@ gctest: gc$(CPU).lib GCAmigaOS$(CPU).lib test.o
 setjmp_t: setjmp_t.o gc.h
        $(LINKER) LIB:c.o setjmp_t.o to setjmp_t lib LIB:sc.lib
 
-cord/cordtest: cord/cordtest.o cord/cord$(CPU).lib gc$(CPU).lib
-       slink LIB:c.o cord/cordtest.o LIB $(MATHLIB) gc$(CPU).lib cord/cord$(CPU).lib LIB:sc.lib TO cord/cordtest
+cordtest: cord/cordtest.o cord/cord$(CPU).lib gc$(CPU).lib
+       slink LIB:c.o cord/cordtest.o LIB $(MATHLIB) gc$(CPU).lib cord/cord$(CPU).lib LIB:sc.lib TO cordtest
 
 
 #------------------LIBBING----------------------------

diff --git a/doc/README.cords b/doc/README.cords
index 6831004b7a16e7517a60b61b1f94c952ffa70a53..02477f4da637c37d588fae97773d1783dea3ec48 100644 (file)
--- a/doc/README.cords
+++ b/doc/README.cords
@@ -36,7 +36,7 @@ editing operations are efficient, even on very large files.
 arguments.  Note that ^R^N and ^R^P move the cursor by
 almost a screen.  It does not understand tabs, which will show
 up as highlighted "I"s.  Use the UNIX "expand" program first.)
-To build the editor, type "make cord/de" in the gc directory.
+To build the editor, type "make de" in the gc directory.
 
 Note that CORD_printf and friends use C functions with variable numbers
 of arguments in non-standard-conforming ways.  This code is known to

diff --git a/doc/README.win32 b/doc/README.win32
index a4b968908e5295f8f1e62a9e15fb47a2a6ae1836..074b3a3eb520b4d38b673835628c2fc7e51d90d3 100644 (file)
--- a/doc/README.win32
+++ b/doc/README.win32
@@ -13,7 +13,7 @@ minutes (a few seconds on a modern machine) before you check the output.
 You should see either a failure indication or a "Collector appears to work"
 message.
 
-A toy editor (cord/de.exe) based on cords (heavyweight
+A toy editor (de.exe) based on cords (heavyweight
 strings represented as trees) has been ported and is included.
 It runs fine under either win32 or win32S.  It serves as an example
 of a true Windows application, except that it was written by a