A variety of dependency changes corresponding to changes in the source

files.

diff --git a/v7/src/microcode/os2utl/makefile.cmn b/v7/src/microcode/os2utl/makefile.cmn
index 15821e750342e0897f2813e7c88c685bacf94f5e..b908c1a7c4f3106d403cc8677afe4abd5e17617e 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.4 1995/10/17 23:07:01 cph Exp $
+###    $Id: makefile.cmn,v 1.5 1995/10/30 08:08:12 cph Exp $
 ###
 ###    Copyright (c) 1994-95 Massachusetts Institute of Technology
 ###
@@ -377,11 +377,14 @@ prmcon.$(OBJ) : scheme.tch prims.h prmcon.h
 $(OS2_OBJECTS) pros2fs.$(OBJ) pros2io.$(OBJ) pros2pm.$(OBJ) : \
        dstack.h osscheme.h outf.h os.h ansidecl.h oscond.h posixtyp.h \
        syscall.h osio.h os2.h os2api.h os2cthrd.h os2ctty.h os2io.h \
-       os2msg.h os2pm.h os2thrd.h
+       os2msg.h os2pm-mt.h os2pm.h os2pm-ed.h os2thrd.h
 os2ctty.$(OBJ) : osctty.h ossig.h
 os2env.$(OBJ) : scheme.tch osenv.h
 os2file.$(OBJ) : osfile.h
 os2fs.$(OBJ) : osfs.h
+os2pm.$(OBJ) : os2pm-id.h os2pm-mi.h os2pm-dc.h os2pm-rp.h
+os2pmcon.$(OBJ) : os2pmcon.h version.h
+os2pmcon.res : os2pmcon.rc os2pmcon.h
 os2proc.$(OBJ) : osproc.h
 os2top.$(OBJ) : scheme.tch ostop.h option.h
 os2tty.$(OBJ) : ostty.h

diff --git a/v7/src/microcode/os2utl/makefile.emx b/v7/src/microcode/os2utl/makefile.emx
index 69b71b442a134853c36f364d4bd88eef9ca68233..8f96b746b83ce4c879fac28cdfe1486a84eaf22e 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.4 1995/10/17 23:06:27 cph Exp $
+###    $Id: makefile.emx,v 1.5 1995/10/30 08:08:32 cph Exp $
 ###
 ###    Copyright (c) 1994-95 Massachusetts Institute of Technology
 ###
@@ -40,8 +40,9 @@
 #### 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.
+# development system (compiler, assembler, linker, etc.), the GNU m4
+# macro preprocessor, and the RC program included with the IBM OS/2
+# Toolkit.
 
 OBJ = o
 ASM = s
@@ -63,6 +64,9 @@ ASFLAGS =
 %.o : %.s
        $(AS) $(ASFLAGS) -o $@ $<
 
+%.res : %.rc
+       rc -r $<
+
 %.exe :
        $(CC) $(LDFLAGS) -o $(basename $@) $^
        emxbind -bq $(basename $@)
@@ -70,12 +74,14 @@ ASFLAGS =
 
 include os2utl\makefile.cmn
 
-scheme.exe : $(OBJECTS) $(SCHEME_OBJECTS)
-       $(CC) $(LDFLAGS) -o $(basename $@) $^ $(SCHEME_LIB)
-       emxbind -bpq $(basename $@)
+scheme.exe : $(OBJECTS) $(SCHEME_OBJECTS) os2pmcon.res
+       $(CC) $(LDFLAGS) -o $(basename $@) \
+       $(OBJECTS) $(SCHEME_OBJECTS) $(SCHEME_LIB)
+       emxbind -bpq $(basename $@) -ros2pmcon.res
        del $(basename $@)
 
 bchschem.exe : $(BCHOBJECTS) $(SCHEME_OBJECTS)
-       $(CC) $(LDFLAGS) -o $(basename $@) $^ $(SCHEME_LIB)
-       emxbind -bpq $(basename $@)
+       $(CC) $(LDFLAGS) -o $(basename $@) \
+       $(OBJECTS) $(SCHEME_OBJECTS) $(SCHEME_LIB)
+       emxbind -bpq $(basename $@) -ros2pmcon.res
        del $(basename $@)

diff --git a/v7/src/microcode/os2utl/makefile.vac b/v7/src/microcode/os2utl/makefile.vac
index 46aec29505ece620c9d4d1fe149f1269e19b6851..e2cc89feb5eff482d02070ef7b3470d64e25dec3 100644 (file)
--- a/v7/src/microcode/os2utl/makefile.vac
+++ b/v7/src/microcode/os2utl/makefile.vac
@@ -1,6 +1,6 @@
 ### -*- Fundamental -*-
 ###
-###    $Id: makefile.vac,v 1.3 1995/10/16 17:26:35 cph Exp $
+###    $Id: makefile.vac,v 1.4 1995/10/30 08:09:24 cph Exp $
 ###
 ###    Copyright (c) 1994-95 Massachusetts Institute of Technology
 ###
@@ -40,11 +40,11 @@
 #### Makefile for Scheme under OS/2 using IBM Visual Age C++
 \f
 # This makefile is configured for use with GNU make, the IBM Visual
-# Age C++ compiler (or IBM C Set++/2), GNU m4, and the GNU assembler
-# included with the EMX/GCC package.
+# Age C++ compiler (or IBM C Set++/2), GNU m4, the GNU assembler
+# included with the EMX/GCC package, and the RC program included with
+# the IBM OS/2 Toolkit.
 
-# For optimization, replace /Ti+ with /O+, and delete /B"/DBGPACK".
-# For C Set++/2, delete /B"/DBGPACK".
+# For optimization, replace /Ti+ with /O+.
 # For OS/2 2.x, replace /B"/EXEPACK:2" with /B"/EXEPACK"
 
 OBJ = obj
@@ -52,7 +52,7 @@ ASM = asm
 CC = icc
 ICCFLAGS = /Gm+ /Q+ /Wall- /Ti+
 CFLAGS = $(ICCFLAGS) /DMIT_SCHEME
-LDFLAGS = $(ICCFLAGS) /B"/EXEPACK:2" /B"/DBGPACK"
+LDFLAGS = $(ICCFLAGS) /B"/EXEPACK:2"
 SCHEME_LDFLAGS = $(LDFLAGS)
 M4 = m4
 M4FLAGS = -DOS2
@@ -68,13 +68,20 @@ ASFLAGS = -Zomf
 %.obj : %.asm
        $(AS) $(ASFLAGS) -o $@ $<
 
+%.res : %.rc
+       rc -r $<
+
 %.exe :
        $(CC) $(LDFLAGS) /Fe$@ $^
 
 include os2utl\makefile.cmn
 
-scheme.exe : $(OBJECTS) $(SCHEME_OBJECTS)
-       $(CC) $(SCHEME_LDFLAGS) /B"/PMTYPE:PM" /Fe$@ $^ $(SCHEME_LIB)
+scheme.exe : $(OBJECTS) $(SCHEME_OBJECTS) os2pmcon.res
+       $(CC) $(SCHEME_LDFLAGS) /B"/PMTYPE:PM" /Fe$@ \
+       $(OBJECTS) $(SCHEME_OBJECTS) $(SCHEME_LIB)
+       rc os2pmcon.res $@
 
-bchschem.exe : $(BCHOBJECTS) $(SCHEME_OBJECTS)
-       $(CC) $(SCHEME_LDFLAGS) /B"/PMTYPE:PM" /Fe$@ $^ $(SCHEME_LIB)
+bchschem.exe : $(BCHOBJECTS) $(SCHEME_OBJECTS) os2pmcon.res
+       $(CC) $(SCHEME_LDFLAGS) /B"/PMTYPE:PM" /Fe$@ \
+       $(OBJECTS) $(SCHEME_OBJECTS) $(SCHEME_LIB)
+       rc os2pmcon.res $@