Remove binary icon file for de_win.

* cord/de_win.ICO: Remove.
* cord/de_win.RC (ABOUTBOX): Comment out ICON usage.
* cord/de_win.RC (DE ICON): Comment out.
* Makefile.direct (CORD_SRCS): Remove de_win.RC; wrap long line.
* Makefile.dj (CORD_SRCS): Ditto.
* Makefile.dj (OTHER_FILES): Remove missing old SCoptions.amiga
and cord/SMakefile.amiga files.
* cord/cord.am (EXTRA_DIST): Remove de_win.RC.
* cord/cord.am: Expand all tabs to spaces.

diff --git a/Makefile.direct b/Makefile.direct
index 9623ee0fe8d40f0c0a04c564d990af2eb4808ff6..b5e75ff849f68df9c00b686d1d755ddb7afa7c4d 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -82,9 +82,11 @@ CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c \
   typd_mlc.c ptr_chck.c mallocx.c gcj_mlc.c specific.c gc_dlopen.c \
   backgraph.c win32_threads.c pthread_start.c thread_local_alloc.c
 
-CORD_SRCS=  cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.ICO cord/de_win.RC
+CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c \
+    cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h \
+    cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.RC
 
-CORD_OBJS=  cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
+CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
 
 SRCS= $(CSRCS) \
     sparc_mach_dep.S include/gc.h include/gc_typed.h include/gc_tiny_fl.h \

diff --git a/Makefile.dj b/Makefile.dj
index 6bc42d5916a4f627b1eac080820c199ea4fceff9..0f033264c9a7807d7dd0f9794245f625722e48de 100644 (file)
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -41,9 +41,11 @@ OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers
 
 CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c
 
-CORD_SRCS=  cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.ICO cord/de_win.RC cord/SCOPTIONS.amiga cord/SMakefile.amiga
+CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c \
+    cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h \
+    cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.RC
 
-CORD_OBJS=  cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
+CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
 
 SRCS= $(CSRCS) \
     sparc_mach_dep.S include/gc.h include/gc_version.h include/gc_typed.h \
@@ -60,7 +62,7 @@ SRCS= $(CSRCS) \
 
 OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
            README tests/test.c test_cpp.cc extra/setjmp_t.c SMakefile.amiga \
-           SCoptions.amiga doc/README.amiga doc/README.win32 \
+           doc/README.amiga doc/README.win32 \
           doc/README.cords doc/README.rs6000 README.QUICK TODO callprocs \
            pc_excludes barrett_diagram doc/README.OS2 doc/README.Mac \
            extra/MacOS.c EMX_MAKEFILE \

diff --git a/cord/cord.am b/cord/cord.am
index f6a3982d12855824ffd184e9bdfdc4462e156403..93e0259fe8bfa7fbace0596b93a08fa1c2395a06 100644 (file)
--- a/cord/cord.am
+++ b/cord/cord.am
@@ -5,15 +5,15 @@ libcord_la_LIBADD = $(top_builddir)/libgc.la
 libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined
 
 libcord_la_SOURCES = \
-       cord/cordbscs.c                         \
-       cord/cordprnt.c                         \
-       cord/cordtest.c                         \
-       cord/cordxtra.c                         
+        cord/cordbscs.c \
+        cord/cordprnt.c \
+        cord/cordtest.c \
+        cord/cordxtra.c
 
 
 EXTRA_DIST += \
-       cord/cordbscs.c cord/cordtest.c cord/de.c \
-       cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h \
-       cord/de_win.h cord/de_win.c cord/de_win.RC cord/de_win.ICO
+        cord/cordbscs.c cord/cordtest.c cord/de.c \
+        cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h \
+        cord/de_win.h cord/de_win.c cord/de_win.RC
 
 pkginclude_HEADERS += include/cord.h

diff --git a/cord/de_win.ICO b/cord/de_win.ICO
deleted file mode 100644 (file)
index b20ac3e..0000000
Binary files a/cord/de_win.ICO and /dev/null differ

diff --git a/cord/de_win.RC b/cord/de_win.RC
index 554a300438911826f4151aebcae89dccf264b2a3..be0b925f0a18b92055c2849be612b6e52afd7d90 100644 (file)
--- a/cord/de_win.RC
+++ b/cord/de_win.RC
@@ -7,19 +7,17 @@
  * Permission is hereby granted to copy this garbage collector for any purpose,
  * provided the above notices are retained on all copies.
  */
-/* Boehm, May 13, 1994 9:50 am PDT */
 
 #include "windows.h"
 #include "de_cmds.h"
 #include "de_win.h"
 
 
-
 ABOUTBOX DIALOG 19, 21, 163, 47
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Demonstration Text Editor"
 BEGIN
-       ICON "DE", -1, 8, 8, 13, 13, WS_CHILD | WS_VISIBLE
+       /* ICON "DE", -1, 8, 8, 13, 13, WS_CHILD | WS_VISIBLE */
        LTEXT "Demonstration Text Editor", -1, 44, 8, 118, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
        LTEXT "Version 4.1", -1, 44, 16, 60, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
        PUSHBUTTON "OK", IDOK, 118, 27, 24, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -74,5 +72,5 @@ BEGIN
 END
 
 
-DE ICON cord\de_win.ICO
+/* DE ICON cord\de_win.ICO */