Miscellaneous changes to OS/2 makefiles.

diff --git a/v7/src/microcode/os2utl/makefile.cmn b/v7/src/microcode/os2utl/makefile.cmn
index 52a4561b2a7fb4624cb3e0e1b65ebda6e3f6db41..15821e750342e0897f2813e7c88c685bacf94f5e 100644 (file)
--- a/v7/src/microcode/os2utl/makefile.cmn
+++ b/v7/src/microcode/os2utl/makefile.cmn
@@ -1,6 +1,6 @@
 ### -*- Fundamental -*-
 ###
-###    $Id: makefile.cmn,v 1.3 1995/10/16 17:26:29 cph Exp $
+###    $Id: makefile.cmn,v 1.4 1995/10/17 23:07:01 cph Exp $
 ###
 ###    Copyright (c) 1994-95 Massachusetts Institute of Technology
 ###
@@ -256,14 +256,14 @@ BCHOBJECTS = $(CORE_OBJECTS) $(BCH_GC_OBJECTS) $(OS2_OBJECTS) \
        $(OS_PRIM_OBJECTS) bchdef.$(OBJ)
 
 clean :
-       del *.$(OBJ)
-       del *.exe
-       del *.tch
-       del *.err
-       del *.sym
-       del cmpauxmd.$(ASM)
-       del usrdef.c
-       del bchdef.c
+       -del *.$(OBJ)
+       -del *.exe
+       -del *.tch
+       -del *.err
+       -del *.sym
+       -del cmpauxmd.$(ASM)
+       -del usrdef.c
+       -del bchdef.c
 
 findprim.exe : findprim.$(OBJ)
 asmcvt.exe : asmcvt.$(OBJ)

diff --git a/v7/src/microcode/os2utl/makefile.emx b/v7/src/microcode/os2utl/makefile.emx
index 61fe9aa20632fb72bb537d4feeeee9841c101a46..69b71b442a134853c36f364d4bd88eef9ca68233 100644 (file)
--- a/v7/src/microcode/os2utl/makefile.emx
+++ b/v7/src/microcode/os2utl/makefile.emx
@@ -1,6 +1,6 @@
 ### -*- Fundamental -*-
 ###
-###    $Id: makefile.emx,v 1.3 1995/10/16 17:26:31 cph Exp $
+###    $Id: makefile.emx,v 1.4 1995/10/17 23:06:27 cph Exp $
 ###
 ###    Copyright (c) 1994-95 Massachusetts Institute of Technology
 ###
@@ -38,7 +38,7 @@
 ###
 
 #### Makefile for Scheme under OS/2 using EMX/GCC
-
+\f
 # This makefile is configured for use with GNU make, the EMX/GCC
 # development system (compiler, assembler, linker, etc.), and the GNU
 # m4 macro preprocessor.
@@ -65,17 +65,17 @@ ASFLAGS =
 
 %.exe :
        $(CC) $(LDFLAGS) -o $(basename $@) $^
-       emxbind -b $(basename $@)
+       emxbind -bq $(basename $@)
        del $(basename $@)
 
 include os2utl\makefile.cmn
 
 scheme.exe : $(OBJECTS) $(SCHEME_OBJECTS)
        $(CC) $(LDFLAGS) -o $(basename $@) $^ $(SCHEME_LIB)
-       emxbind -bp $(basename $@)
+       emxbind -bpq $(basename $@)
        del $(basename $@)
 
 bchschem.exe : $(BCHOBJECTS) $(SCHEME_OBJECTS)
        $(CC) $(LDFLAGS) -o $(basename $@) $^ $(SCHEME_LIB)
-       emxbind -bp $(basename $@)
+       emxbind -bpq $(basename $@)
        del $(basename $@)

diff --git a/v7/src/microcode/os2utl/makefile.gcc b/v7/src/microcode/os2utl/makefile.gcc
index 2a917886d586cd9f7ac9d763a0d107bb67e20ce4..d873cbe278dd30c1ca355cb00f756a3b7a724110 100644 (file)
--- a/v7/src/microcode/os2utl/makefile.gcc
+++ b/v7/src/microcode/os2utl/makefile.gcc
@@ -1,6 +1,6 @@
 ### -*- Fundamental -*-
 ###
-###    $Id: makefile.gcc,v 1.3 1995/10/16 17:26:33 cph Exp $
+###    $Id: makefile.gcc,v 1.4 1995/10/17 23:06:21 cph Exp $
 ###
 ###    Copyright (c) 1995 Massachusetts Institute of Technology
 ###
@@ -38,7 +38,7 @@
 ###
 
 #### Makefile for Scheme under OS/2 using GCC/2
-
+\f
 # This makefile is configured for use with GNU make, the GCC/2
 # development system (compiler, assembler, linker, etc.), and the GNU
 # m4 macro preprocessor.

diff --git a/v7/src/microcode/os2utl/makefile.wcc b/v7/src/microcode/os2utl/makefile.wcc
index ee439ea7aec5439cd9662ccab65db44ac5eb4bf7..adab1db6c540e8b44c006251d8d7409b8b3fd238 100644 (file)
--- a/v7/src/microcode/os2utl/makefile.wcc
+++ b/v7/src/microcode/os2utl/makefile.wcc
@@ -1,6 +1,6 @@
 ### -*- Fundamental -*-
 ###
-###    $Id: makefile.wcc,v 1.2 1995/10/16 17:26:13 cph Exp $
+###    $Id: makefile.wcc,v 1.3 1995/10/17 23:06:53 cph Exp $
 ###
 ###    Copyright (c) 1994-95 Massachusetts Institute of Technology
 ###
@@ -101,14 +101,7 @@ M4FLAGS = -DOS2 -DDASM -DWCC386R
 # /mf          use flat memory model
 # /zq          operate quietly
 ASFLAGS = /4pr /d1 /fpi /fp3 /mf /zq
-
-# Complicated definition to convert space-delimited object-file list
-# to a comma-delimited list:
-comma := ,
-empty :=
-space := $(empty) $(empty)
-caret = $(subst $(space),$(comma),$(strip $^))
-
+\f
 %.obj : %.c
        $(CC) $(CFLAGS) $<
 
@@ -116,7 +109,7 @@ caret = $(subst $(space),$(comma),$(strip $^))
        $(AS) $(ASFLAGS) /fo=$@ $<
 
 %.exe :
-       wlink system os2v2 $(LDFLAGS) name $@ file $(caret)
+       wlink system os2v2 $(LDFLAGS) name $@ file { $^ }
 
 include os2utl\makefile.cmn
 
@@ -124,7 +117,7 @@ cmpauxmd.asm : cmpauxmd.m4 asmcvt.exe
        .\asmcvt pre < $< | $(M4) $(M4FLAGS) | .\asmcvt post > $@
 
 scheme.exe : $(OBJECTS) $(SCHEME_OBJECTS)
-       wlink system os2v2_pm name $@ $(LDFLAGS) file $(caret) $(SCHEME_LIB)
+       wlink system os2v2_pm name $@ $(LDFLAGS) file { $^ } $(SCHEME_LIB)
 
 bchschem.exe : $(BCHOBJECTS) $(SCHEME_OBJECTS)
-       wlink system os2v2_pm name $@ $(LDFLAGS) file $(caret) $(SCHEME_LIB)
+       wlink system os2v2_pm name $@ $(LDFLAGS) file { $^ } $(SCHEME_LIB)