* src/mm/boehm-gc/BCC_MAKEFILE, src/mm/boehm-gc/digimars.mak: unix2dos'ed
authorStefan Ring <stefan@complang.tuwien.ac.at>
Wed, 5 Mar 2008 19:58:01 +0000 (20:58 +0100)
committerStefan Ring <stefan@complang.tuwien.ac.at>
Wed, 5 Mar 2008 19:58:01 +0000 (20:58 +0100)
the way they were in gc6.8.

src/mm/boehm-gc/BCC_MAKEFILE
src/mm/boehm-gc/digimars.mak

index 997bce7b7171db57f36d0984a0ee07ed26f5c0d0..e21bc3d8dfe22efeef43bca48e5b9360c624af8c 100644 (file)
@@ -1,88 +1,88 @@
-# Makefile for Borland C++ 5.5 on NT
-# If you have the Borland assembler, remove "-DUSE_GENERIC"
-#
-bc=       c:\Borland\BCC55
-bcbin=    $(bc)\bin
-bclib=    $(bc)\lib
-bcinclude= $(bc)\include
-
-gcinclude1 = $(bc)\gc6.2\include
-gcinclude2 = $(bc)\gc6.2\cord
-
-cc=     $(bcbin)\bcc32
-rc=     $(bcbin)\brc32
-lib=    $(bcbin)\tlib
-link=   $(bcbin)\ilink32
-cflags=  -O2 -R -v- -vi -H -H=gc.csm -I$(bcinclude);$(gcinclude1);$(gcinclude2) -L$(bclib) \
-        -w-pro -w-aus -w-par -w-ccc -w-rch -a4 -D__STDC__=0
-#defines= -DSILENT
-defines= -DSILENT -DALL_INTERIOR_POINTERS -DUSE_GENERIC -DNO_GETENV -DJAVA_FINALIZATION -DGC_OPERATOR_NEW_ARRAY
-
-.c.obj:
-       $(cc) @&&|
-       $(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.c
-|
-
-.cpp.obj:
-       $(cc) @&&|
-       $(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.cpp
-|
-
-.rc.res:
-    $(rc) -i$(bcinclude) -r -fo$* $*.rc
-
-XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \
-    XXXmach_dep.obj XXXos_dep.obj XXXmark_rts.obj XXXheaders.obj XXXmark.obj \
-    XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \
-    XXXdbg_mlc.obj XXXmalloc.obj XXXstubborn.obj XXXdyn_load.obj \
-    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj
-
-OBJS= $(XXXOBJS:XXX=)
-
-all: gctest.exe cord\de.exe test_cpp.exe
-
-$(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h MAKEFILE
-
-gc.lib: $(OBJS)
-       del gc.lib
-       $(lib) $* @&&|
-       $(XXXOBJS:XXX=+)
-|
-
-gctest.exe: tests\test.obj gc.lib
-    $(cc) @&&|
-       $(cflags) -W -e$* tests\test.obj gc.lib
-|
-
-cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h \
-    cord\de_cmds.h
-
-cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj \
-       cord\de_win.res gc.lib
-       $(cc) @&&|
-       $(cflags) -W -e$* cord\cordbscs.obj cord\cordxtra.obj \
-       cord\de.obj cord\de_win.obj gc.lib
-|
-    $(rc) cord\de_win.res cord\de.exe
-
-gc_cpp.obj: include\gc_cpp.h include\gc.h
-
-gc_cpp.cpp: gc_cpp.cc
-       copy gc_cpp.cc gc_cpp.cpp
-
-test_cpp.cpp: tests\test_cpp.cc
-       copy tests\test_cpp.cc test_cpp.cpp
-
-test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib
-    $(cc) @&&|
-       $(cflags) -W -e$* test_cpp.obj gc.lib
-|
-
-scratch:
-    -del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm
-
-clean:
-      del gc.lib
-      del *.obj
-      del tests\test.obj
-
+# Makefile for Borland C++ 5.5 on NT\r
+# If you have the Borland assembler, remove "-DUSE_GENERIC"\r
+#\r
+bc=       c:\Borland\BCC55\r
+bcbin=    $(bc)\bin\r
+bclib=    $(bc)\lib\r
+bcinclude= $(bc)\include\r
+\r
+gcinclude1 = $(bc)\gc6.2\include\r
+gcinclude2 = $(bc)\gc6.2\cord\r
+\r
+cc=     $(bcbin)\bcc32\r
+rc=     $(bcbin)\brc32\r
+lib=    $(bcbin)\tlib\r
+link=   $(bcbin)\ilink32\r
+cflags=  -O2 -R -v- -vi -H -H=gc.csm -I$(bcinclude);$(gcinclude1);$(gcinclude2) -L$(bclib) \\r
+        -w-pro -w-aus -w-par -w-ccc -w-rch -a4 -D__STDC__=0\r
+#defines= -DSILENT\r
+defines= -DSILENT -DALL_INTERIOR_POINTERS -DUSE_GENERIC -DNO_GETENV -DJAVA_FINALIZATION -DGC_OPERATOR_NEW_ARRAY\r
+\r
+.c.obj:\r
+       $(cc) @&&|\r
+       $(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.c\r
+|\r
+\r
+.cpp.obj:\r
+       $(cc) @&&|\r
+       $(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.cpp\r
+|\r
+\r
+.rc.res:\r
+    $(rc) -i$(bcinclude) -r -fo$* $*.rc\r
+\r
+XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \\r
+    XXXmach_dep.obj XXXos_dep.obj XXXmark_rts.obj XXXheaders.obj XXXmark.obj \\r
+    XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \\r
+    XXXdbg_mlc.obj XXXmalloc.obj XXXstubborn.obj XXXdyn_load.obj \\r
+    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj\r
+\r
+OBJS= $(XXXOBJS:XXX=)\r
+\r
+all: gctest.exe cord\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
+gc.lib: $(OBJS)\r
+       del gc.lib\r
+       $(lib) $* @&&|\r
+       $(XXXOBJS:XXX=+)\r
+|\r
+\r
+gctest.exe: tests\test.obj gc.lib\r
+    $(cc) @&&|\r
+       $(cflags) -W -e$* tests\test.obj gc.lib\r
+|\r
+\r
+cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h \\r
+    cord\de_cmds.h\r
+\r
+cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj \\r
+       cord\de_win.res gc.lib\r
+       $(cc) @&&|\r
+       $(cflags) -W -e$* cord\cordbscs.obj cord\cordxtra.obj \\r
+       cord\de.obj cord\de_win.obj gc.lib\r
+|\r
+    $(rc) cord\de_win.res cord\de.exe\r
+\r
+gc_cpp.obj: include\gc_cpp.h include\gc.h\r
+\r
+gc_cpp.cpp: gc_cpp.cc\r
+       copy gc_cpp.cc gc_cpp.cpp\r
+\r
+test_cpp.cpp: tests\test_cpp.cc\r
+       copy tests\test_cpp.cc test_cpp.cpp\r
+\r
+test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib\r
+    $(cc) @&&|\r
+       $(cflags) -W -e$* test_cpp.obj gc.lib\r
+|\r
+\r
+scratch:\r
+    -del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm\r
+\r
+clean:\r
+      del gc.lib\r
+      del *.obj\r
+      del tests\test.obj\r
+\r
index 1265b1449ed6c8ff98e76582f2decfe91c0c32b1..9778feee97624ea5745e384fe7148259c6a52d27 100644 (file)
@@ -1,90 +1,90 @@
-# Makefile to build Hans Boehm garbage collector using the Digital Mars
-# compiler from www.digitalmars.com
-# Written by Walter Bright
-
-
-DEFINES=-DNDEBUG -DSILENT -DGC_BUILD -D_WINDOWS -DGC_DLL -DALL_INTERIOR_POINTERS -D__STDC__ -DWIN32_THREADS
-CFLAGS=-Iinclude $(DEFINES) -wx -g
-LFLAGS=/ma/implib/co
-CC=sc
-
-.c.obj:
-       $(CC) -c $(CFLAGS) $*
-
-.cpp.obj:
-       $(CC) -c $(CFLAGS) -Aa $*
-
-OBJS=  \
-       allchblk.obj\
-       alloc.obj\
-       blacklst.obj\
-       checksums.obj\
-       dbg_mlc.obj\
-       dyn_load.obj\
-       finalize.obj\
-       gc_cpp.obj\
-       headers.obj\
-       mach_dep.obj\
-       malloc.obj\
-       mallocx.obj\
-       mark.obj\
-       mark_rts.obj\
-       misc.obj\
-       new_hblk.obj\
-       obj_map.obj\
-       os_dep.obj\
-       ptr_chck.obj\
-       reclaim.obj\
-       stubborn.obj\
-       typd_mlc.obj\
-       win32_threads.obj
-
-targets: gc.dll gc.lib gctest.exe
-
-gc.dll: $(OBJS) gc.def digimars.mak
-       sc -ogc.dll $(OBJS) -L$(LFLAGS) gc.def  kernel32.lib user32.lib
-
-gc.def: digimars.mak
-       echo LIBRARY GC >gc.def
-       echo DESCRIPTION "Hans Boehm Garbage Collector" >>gc.def
-       echo EXETYPE NT >>gc.def
-       echo EXPORTS >>gc.def
-       echo GC_is_visible_print_proc >>gc.def
-       echo GC_is_valid_displacement_print_proc >>gc.def
-
-clean:
-       del gc.def
-       del $(OBJS)
-
-
-gctest.exe : gc.lib tests\test.obj
-       sc -ogctest.exe tests\test.obj gc.lib
-
-tests\test.obj : tests\test.c
-       $(CC) -c -g -DNDEBUG -DSILENT -DGC_BUILD -D_WINDOWS -DGC_DLL \
-       -DALL_INTERIOR_POINTERS -DWIN32_THREADS \
-       -Iinclude tests\test.c -otests\test.obj
-
-allchblk.obj: allchblk.c
-alloc.obj: alloc.c
-blacklst.obj: blacklst.c
-checksums.obj: checksums.c
-dbg_mlc.obj: dbg_mlc.c
-dyn_load.obj: dyn_load.c
-finalize.obj: finalize.c
-gc_cpp.obj: gc_cpp.cpp
-headers.obj: headers.c
-mach_dep.obj: mach_dep.c
-malloc.obj: malloc.c
-mallocx.obj: mallocx.c
-mark.obj: mark.c
-mark_rts.obj: mark_rts.c
-misc.obj: misc.c
-new_hblk.obj: new_hblk.c
-obj_map.obj: obj_map.c
-os_dep.obj: os_dep.c
-ptr_chck.obj: ptr_chck.c
-reclaim.obj: reclaim.c
-stubborn.obj: stubborn.c
-typd_mlc.obj: typd_mlc.c
-win32_threads.obj: win32_threads.c
+# Makefile to build Hans Boehm garbage collector using the Digital Mars\r
+# compiler from www.digitalmars.com\r
+# Written by Walter Bright\r
+\r
+\r
+DEFINES=-DNDEBUG -DSILENT -DGC_BUILD -D_WINDOWS -DGC_DLL -DALL_INTERIOR_POINTERS -D__STDC__ -DWIN32_THREADS\r
+CFLAGS=-Iinclude $(DEFINES) -wx -g\r
+LFLAGS=/ma/implib/co\r
+CC=sc\r
+\r
+.c.obj:\r
+       $(CC) -c $(CFLAGS) $*\r
+\r
+.cpp.obj:\r
+       $(CC) -c $(CFLAGS) -Aa $*\r
+\r
+OBJS=  \\r
+       allchblk.obj\\r
+       alloc.obj\\r
+       blacklst.obj\\r
+       checksums.obj\\r
+       dbg_mlc.obj\\r
+       dyn_load.obj\\r
+       finalize.obj\\r
+       gc_cpp.obj\\r
+       headers.obj\\r
+       mach_dep.obj\\r
+       malloc.obj\\r
+       mallocx.obj\\r
+       mark.obj\\r
+       mark_rts.obj\\r
+       misc.obj\\r
+       new_hblk.obj\\r
+       obj_map.obj\\r
+       os_dep.obj\\r
+       ptr_chck.obj\\r
+       reclaim.obj\\r
+       stubborn.obj\\r
+       typd_mlc.obj\\r
+       win32_threads.obj\r
+\r
+targets: gc.dll gc.lib gctest.exe\r
+\r
+gc.dll: $(OBJS) gc.def digimars.mak\r
+       sc -ogc.dll $(OBJS) -L$(LFLAGS) gc.def  kernel32.lib user32.lib\r
+\r
+gc.def: digimars.mak\r
+       echo LIBRARY GC >gc.def\r
+       echo DESCRIPTION "Hans Boehm Garbage Collector" >>gc.def\r
+       echo EXETYPE NT >>gc.def\r
+       echo EXPORTS >>gc.def\r
+       echo GC_is_visible_print_proc >>gc.def\r
+       echo GC_is_valid_displacement_print_proc >>gc.def\r
+\r
+clean:\r
+       del gc.def\r
+       del $(OBJS)\r
+\r
+\r
+gctest.exe : gc.lib tests\test.obj\r
+       sc -ogctest.exe tests\test.obj gc.lib\r
+\r
+tests\test.obj : tests\test.c\r
+       $(CC) -c -g -DNDEBUG -DSILENT -DGC_BUILD -D_WINDOWS -DGC_DLL \\r
+       -DALL_INTERIOR_POINTERS -DWIN32_THREADS \\r
+       -Iinclude tests\test.c -otests\test.obj\r
+\r
+allchblk.obj: allchblk.c\r
+alloc.obj: alloc.c\r
+blacklst.obj: blacklst.c\r
+checksums.obj: checksums.c\r
+dbg_mlc.obj: dbg_mlc.c\r
+dyn_load.obj: dyn_load.c\r
+finalize.obj: finalize.c\r
+gc_cpp.obj: gc_cpp.cpp\r
+headers.obj: headers.c\r
+mach_dep.obj: mach_dep.c\r
+malloc.obj: malloc.c\r
+mallocx.obj: mallocx.c\r
+mark.obj: mark.c\r
+mark_rts.obj: mark_rts.c\r
+misc.obj: misc.c\r
+new_hblk.obj: new_hblk.c\r
+obj_map.obj: obj_map.c\r
+os_dep.obj: os_dep.c\r
+ptr_chck.obj: ptr_chck.c\r
+reclaim.obj: reclaim.c\r
+stubborn.obj: stubborn.c\r
+typd_mlc.obj: typd_mlc.c\r
+win32_threads.obj: win32_threads.c\r