From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 17 Oct 1995 23:07:01 +0000 (+0000)
Subject: Miscellaneous changes to OS/2 makefiles.
X-Git-Tag: 20090517-FFI~5887
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=50b364114973acfcd61aad205da16a06af3cae6b;p=mit-scheme.git
Miscellaneous changes to OS/2 makefiles.
---
diff --git a/v7/src/microcode/os2utl/makefile.cmn b/v7/src/microcode/os2utl/makefile.cmn
index 52a4561b2..15821e750 100644
--- 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 61fe9aa20..69b71b442 100644
--- 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
-
+
# 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 2a917886d..d873cbe27 100644
--- 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
-
+
# 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 ee439ea7a..adab1db6c 100644
--- 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 $^))
-
+
%.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)