From 5c916cffb5ffa2bc260b6573576cc2da944791d9 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sat, 5 Sep 2020 12:59:08 -0700 Subject: [PATCH] Remove obsoleted include files (replaced by xxxdefs.h files) and adjust dependencies in makefiles modified: bin/makefile-darwin.386-x modified: bin/makefile-darwin.x86_64-x modified: bin/makefile-init.386 modified: bin/makefile-sunos5.386-x modified: bin/makefile-tail deleted: inc/car-cdr.h deleted: inc/chardev.h deleted: inc/conspage.h deleted: inc/dir.h deleted: inc/dsk.h deleted: inc/dspsubrs.h deleted: inc/llstk.h deleted: inc/storage.h deleted: inc/ufs.h deleted: inc/uraid.h --- bin/makefile-darwin.386-x | 2 +- bin/makefile-darwin.x86_64-x | 2 +- bin/makefile-init.386 | 2 +- bin/makefile-sunos5.386-x | 2 +- bin/makefile-tail | 79 ++++++++++++++++++------------------ inc/car-cdr.h | 9 ---- inc/chardev.h | 7 ---- inc/conspage.h | 3 -- inc/dir.h | 10 ----- inc/dsk.h | 21 ---------- inc/dspsubrs.h | 8 ---- inc/llstk.h | 11 ----- inc/storage.h | 4 -- inc/ufs.h | 13 ------ inc/uraid.h | 6 --- 15 files changed, 43 insertions(+), 136 deletions(-) delete mode 100644 inc/car-cdr.h delete mode 100644 inc/chardev.h delete mode 100644 inc/conspage.h delete mode 100644 inc/dir.h delete mode 100644 inc/dsk.h delete mode 100644 inc/dspsubrs.h delete mode 100644 inc/llstk.h delete mode 100644 inc/storage.h delete mode 100644 inc/ufs.h delete mode 100644 inc/uraid.h diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x index aeab3ad..537669b 100755 --- a/bin/makefile-darwin.386-x +++ b/bin/makefile-darwin.386-x @@ -49,5 +49,5 @@ $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emlglob.h \ $(INCDIR)initatms.h $(INCDIR)gc.h \ $(INCDIR)arith.h $(INCDIR)stream.h \ $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ - $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(INCDIR)car-cdr.h $(INCDIR)conspage.h $(INCDIR)llstk.h + $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(CC) $(DISPRFLAGS) -UOPDISP $(SRCDIR)xc.c -I$(INCDIR) -o $(OBJECTDIR)xc.o diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x index 2436db9..66a6408 100755 --- a/bin/makefile-darwin.x86_64-x +++ b/bin/makefile-darwin.x86_64-x @@ -49,5 +49,5 @@ $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emlglob.h \ $(INCDIR)initatms.h $(INCDIR)gc.h \ $(INCDIR)arith.h $(INCDIR)stream.h \ $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ - $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(INCDIR)car-cdr.h $(INCDIR)conspage.h $(INCDIR)llstk.h + $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(CC) $(DISPRFLAGS) -UOPDISP $(SRCDIR)xc.c -I$(INCDIR) -o $(OBJECTDIR)xc.o diff --git a/bin/makefile-init.386 b/bin/makefile-init.386 index 9be644f..f673f10 100755 --- a/bin/makefile-init.386 +++ b/bin/makefile-init.386 @@ -48,5 +48,5 @@ $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emlglob.h \ $(INCDIR)initatms.h $(INCDIR)gc.h \ $(INCDIR)arith.h $(INCDIR)stream.h \ $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ - $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(INCDIR)car-cdr.h + $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(CC) $(DISPRFLAGS) -UOPDISP $(SRCDIR)xc.c -I$(INCDIR) -o $(OBJECTDIR)xc.o diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x index 92f10bc..5d31b36 100755 --- a/bin/makefile-sunos5.386-x +++ b/bin/makefile-sunos5.386-x @@ -81,5 +81,5 @@ $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emlglob.h \ $(INCDIR)initatms.h $(INCDIR)gc.h \ $(INCDIR)arith.h $(INCDIR)stream.h \ $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ - $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(INCDIR)car-cdr.h $(INCDIR)conspage.h $(INCDIR)llstk.h + $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(CC) $(DISPRFLAGS) -UOPDISP $(SRCDIR)xc.c -I$(INCDIR) -o $(OBJECTDIR)xc.o diff --git a/bin/makefile-tail b/bin/makefile-tail index 2402598..dc72db4 100755 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -230,7 +230,7 @@ $(OBJECTDIR)main.o : $(SRCDIR)main.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)emlglob.h $(INCDIR)address.h $(INCDIR)lsptypes.h \ $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)lspglob.h \ $(INCDIR)lispmap.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \ - $(INCDIR)return.h $(INCDIR)debug.h $(INCDIR)profile.h $(INCDIR)unixfork.h $(INCDIR)dir.h $(INCDIR)storage.h + $(INCDIR)return.h $(INCDIR)debug.h $(INCDIR)profile.h $(INCDIR)unixfork.h $(CC) $(RFLAGS) $(SRCDIR)main.c $(INLINE) -o $(OBJECTDIR)main$(OEXT) $(OBJECTDIR)dbgtool.o : $(SRCDIR)dbgtool.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -247,7 +247,7 @@ $(OBJECTDIR)kprint.o : $(SRCDIR)kprint.c $(REQUIRED-INCS) $(INCDIR)print.h \ $(INCDIR)address.h $(INCDIR)lispemul.h \ $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)initatms.h \ $(INCDIR)cell.h $(INCDIR)emlglob.h $(INCDIR)lispmap.h \ - $(INCDIR)adr68k.h $(INCDIR)car-cdr.h + $(INCDIR)adr68k.h $(CC) $(RFLAGS) $(SRCDIR)kprint.c $(INLINE) -o $(OBJECTDIR)kprint$(OEXT) $(OBJECTDIR)testtool.o : $(SRCDIR)testtool.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -259,7 +259,7 @@ $(OBJECTDIR)testtool.o : $(SRCDIR)testtool.c $(REQUIRED-INCS) $(INCDIR)lispemu $(OBJECTDIR)allocmds.o : $(SRCDIR)allocmds.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)cell.h $(INCDIR)lispmap.h \ - $(INCDIR)initatms.h $(INCDIR)sysatms.h $(INCDIR)lspglob.h $(INCDIR)storage.h + $(INCDIR)initatms.h $(INCDIR)sysatms.h $(INCDIR)lspglob.h $(CC) $(RFLAGS) $(SRCDIR)allocmds.c $(INLINE) -o $(OBJECTDIR)allocmds$(OEXT) $(OBJECTDIR)arith2.o : $(SRCDIR)arith2.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -335,7 +335,7 @@ $(OBJECTDIR)bbtsub.o : $(SRCDIR)bbtsub.c $(INCDIR)bbtsub.h $(REQUIRED-INCS) $(I $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h \ $(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)dspdata.h \ $(INCDIR)bitblt.h $(INCDIR)bb.h $(INCDIR)dbprint.h \ - $(INCDIR)stack.h $(INCDIR)cell.h $(INCDIR)gc.h $(INCDIR)arith.h $(INCDIR)fp.h $(INCDIR)car-cdr.h + $(INCDIR)stack.h $(INCDIR)cell.h $(INCDIR)gc.h $(INCDIR)arith.h $(INCDIR)fp.h $(CC) $(RFLAGS) $(SRCDIR)bbtsub.c $(INLINE) -o $(OBJECTDIR)bbtsub$(OEXT) $(OBJECTDIR)blt.o : $(SRCDIR)blt.c $(REQUIRED-INCS) $(INCDIR)lispemul.h $(INCDIR)address.h \ @@ -350,10 +350,10 @@ $(OBJECTDIR)byteswap.o: $(SRCDIR)byteswap.c $(REQUIRED-INCS) $(INLINE) $(OBJECTDIR)car-cdr.o : $(SRCDIR)car-cdr.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)emlglob.h $(INCDIR)lspglob.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h \ - $(INCDIR)gc.h $(INCDIR)cell.h $(INCDIR)car-cdr.h + $(INCDIR)gc.h $(INCDIR)cell.h $(CC) $(RFLAGS) $(SRCDIR)car-cdr.c $(INLINE) -o $(OBJECTDIR)car-cdr$(OEXT) -$(OBJECTDIR)chardev.o : $(SRCDIR)chardev.c $(INCDIR)chardev.h $(REQUIRED-INCS) $(INCDIR)lispemul.h \ +$(OBJECTDIR)chardev.o : $(SRCDIR)chardev.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)lspglob.h $(INCDIR)stream.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)arith.h $(INCDIR)locfile.h \ @@ -382,13 +382,13 @@ $(OBJECTDIR)lineblt8.o : $(SRCDIR)lineblt8.c $(REQUIRED-INCS) $(INCDIR)lispemu $(OBJECTDIR)common.o : $(SRCDIR)common.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \ - $(INCDIR)emlglob.h $(INCDIR)uraid.h + $(INCDIR)emlglob.h $(CC) $(RFLAGS) $(SRCDIR)common.c $(INLINE) -o $(OBJECTDIR)common$(OEXT) $(OBJECTDIR)conspage.o : $(SRCDIR)conspage.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)cell.h $(INCDIR)lispmap.h \ - $(INCDIR)gc.h $(INCDIR)lspglob.h $(INCDIR)conspage.h + $(INCDIR)gc.h $(INCDIR)lspglob.h $(CC) $(RFLAGS) $(SRCDIR)conspage.c $(INLINE) -o $(OBJECTDIR)conspage$(OEXT) $(OBJECTDIR)mkcell.o : $(SRCDIR)mkcell.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -407,7 +407,7 @@ $(OBJECTDIR)z2.o : $(SRCDIR)z2.c $(REQUIRED-INCS) \ $(INCDIR)lispemul.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h \ $(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)address.h \ $(INCDIR)adr68k.h $(INCDIR)cell.h $(INCDIR)stack.h \ - $(INCDIR)gc.h $(INCDIR)my.h $(INCDIR)car-cdr.h $(INCDIR)conspage.h + $(INCDIR)gc.h $(INCDIR)my.h $(CC) $(RFLAGS) $(SRCDIR)z2.c $(INLINE) -o $(OBJECTDIR)z2$(OEXT) $(OBJECTDIR)eqf.o : $(SRCDIR)eqf.c $(REQUIRED-INCS) $(INCDIR)fp.h \ @@ -443,10 +443,10 @@ $(OBJECTDIR)ubf3.o : $(SRCDIR)ubf3.c $(REQUIRED-INCS) \ $(CC) $(RFLAGS) $(SRCDIR)ubf3.c $(INLINE) -o $(OBJECTDIR)ubf3$(OEXT) $(OBJECTDIR)uutils.o : $(SRCDIR)uutils.c $(REQUIRED-INCS) \ - $(INCDIR)lsptypes.h $(INCDIR)keyboard.h $(INCDIR)uraid.h + $(INCDIR)lsptypes.h $(INCDIR)keyboard.h $(CC) $(RFLAGS) $(SRCDIR)uutils.c $(INLINE) -o $(OBJECTDIR)uutils$(OEXT) -$(OBJECTDIR)dspsubrs.o : $(SRCDIR)dspsubrs.c $(INCDIR)dspsubrs.h $(REQUIRED-INCS) $(INCDIR)lispemul.h \ +$(OBJECTDIR)dspsubrs.o : $(SRCDIR)dspsubrs.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)display.h $(INCDIR)lsptypes.h \ $(INCDIR)arith.h $(INCDIR)fp.h $(CC) $(RFLAGS) $(SRCDIR)dspsubrs.c $(INLINE) -o $(OBJECTDIR)dspsubrs$(OEXT) @@ -476,20 +476,19 @@ $(OBJECTDIR)findkey.o : $(SRCDIR)findkey.c $(REQUIRED-INCS) $(INCDIR)lispemul. $(OBJECTDIR)dsk.o : $(SRCDIR)dsk.c $(REQUIRED-INCS) $(INCDIR)lispemul.h $(INCDIR)lispmap.h \ $(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \ $(INCDIR)fp.h $(INCDIR)arith.h $(INCDIR)stream.h $(INCDIR)timeout.h \ - $(INCDIR)locfile.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h $(INCDIR)car-cdr.h $(INCDIR)dsk.h $(INCDIR)dir.h \ - $(INCDIR)ufs.h + $(INCDIR)locfile.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h $(CC) $(RFLAGS) $(SRCDIR)dsk.c $(INLINE) -o $(OBJECTDIR)dsk$(OEXT) -$(OBJECTDIR)ufs.o : $(SRCDIR)ufs.c $(INCDIR)ufs.h $(REQUIRED-INCS) $(INCDIR)lispemul.h $(INCDIR)lispmap.h \ +$(OBJECTDIR)ufs.o : $(SRCDIR)ufs.c $(REQUIRED-INCS) $(INCDIR)lispemul.h $(INCDIR)lispmap.h \ $(INCDIR)adr68k.h $(INCDIR)dbprint.h $(INLINE)\ $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)arith.h \ - $(INCDIR)stream.h $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)dbprint.h $(INCDIR)dsk.h + $(INCDIR)stream.h $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)dbprint.h $(CC) $(RFLAGS) $(SRCDIR)ufs.c $(INLINE) -o $(OBJECTDIR)ufs$(OEXT) -$(OBJECTDIR)dir.o : $(SRCDIR)dir.c $(INCDIR)dir.h $(REQUIRED-INCS) $(INCDIR)lispemul.h \ +$(OBJECTDIR)dir.o : $(SRCDIR)dir.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)adr68k.h $(INCDIR)lsptypes.h \ - $(INCDIR)arith.h $(INCDIR)lspglob.h $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)dsk.h \ - $(INCDIR)ufs.h + $(INCDIR)arith.h $(INCDIR)lspglob.h $(INCDIR)timeout.h $(INCDIR)locfile.h \ + $(CC) $(RFLAGS) $(SRCDIR)dir.c $(INLINE) -o $(OBJECTDIR)dir$(OEXT) $(OBJECTDIR)fvar.o : $(SRCDIR)fvar.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -513,12 +512,12 @@ $(OBJECTDIR)gcarray.o : $(SRCDIR)gcarray.c $(REQUIRED-INCS) $(INCDIR)lispemul. $(INCDIR)lsptypes.h $(INCDIR)address.h \ $(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)stack.h \ $(INCDIR)cell.h $(INCDIR)ifpage.h $(INCDIR)gc.h \ - $(INCDIR)array.h $(INCDIR)car-cdr.h + $(INCDIR)array.h $(CC) $(RFLAGS) $(SRCDIR)gcarray.c $(INLINE) -o $(OBJECTDIR)gcarray$(OEXT) $(OBJECTDIR)gcfinal.o : $(SRCDIR)gcfinal.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h \ - $(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)stack.h $(INCDIR)llstk.h\ + $(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)stack.h \ $(INCDIR)cell.h $(INCDIR)ifpage.h $(INCDIR)gc.h \ $(INCDIR)array.h $(CC) $(RFLAGS) $(SRCDIR)gcfinal.c $(INLINE) -o $(OBJECTDIR)gcfinal$(OEXT) @@ -531,7 +530,7 @@ $(OBJECTDIR)gcoflow.o : $(SRCDIR)gcoflow.c $(REQUIRED-INCS) $(INCDIR)lispemul. $(OBJECTDIR)gchtfind.o : $(SRCDIR)gchtfind.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h \ $(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)gc.h \ - $(INCDIR)lispmap.h $(INCDIR)cell.h $(INCDIR)storage.h + $(INCDIR)lispmap.h $(INCDIR)cell.h $(CC) $(RFLAGS) $(SRCDIR)gchtfind.c $(INLINE) -o $(OBJECTDIR)gchtfind$(OEXT) $(OBJECTDIR)gcmain3.o : $(SRCDIR)gcmain3.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -544,13 +543,13 @@ $(OBJECTDIR)gcmain3.o : $(SRCDIR)gcmain3.c $(REQUIRED-INCS) $(INCDIR)lispemul. $(OBJECTDIR)gcr.o : $(SRCDIR)gcr.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)emlglob.h $(INCDIR)lsptypes.h \ $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \ - $(INCDIR)stack.h $(INCDIR)gc.h $(INCDIR)dspsubrs.h + $(INCDIR)stack.h $(INCDIR)gc.h $(CC) $(RFLAGS) $(SRCDIR)gcr.c $(INLINE) -o $(OBJECTDIR)gcr$(OEXT) $(OBJECTDIR)gcrcell.o : $(SRCDIR)gcrcell.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)dbprint.h \ $(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)stack.h \ - $(INCDIR)cell.h $(INCDIR)ifpage.h $(INCDIR)gc.h $(INCDIR)car-cdr.h + $(INCDIR)cell.h $(INCDIR)ifpage.h $(INCDIR)gc.h $(CC) $(RFLAGS) $(SRCDIR)gcrcell.c $(INLINE) -o $(OBJECTDIR)gcrcell$(OEXT) $(OBJECTDIR)gccode.o : $(SRCDIR)gccode.c $(REQUIRED-INCS) \ @@ -571,8 +570,8 @@ $(OBJECTDIR)gvar2.o : $(SRCDIR)gvar2.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(OBJECTDIR)hardrtn.o : $(SRCDIR)hardrtn.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lspglob.h $(INCDIR)adr68k.h \ - $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)llstk.h $(INCDIR)return.h \ - $(INCDIR)emlglob.h $(INCDIR)storage.h + $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h \ + $(INCDIR)emlglob.h $(CC) $(RFLAGS) $(SRCDIR)hardrtn.c $(INLINE) -o $(OBJECTDIR)hardrtn$(OEXT) $(OBJECTDIR)inet.o : $(SRCDIR)inet.c $(REQUIRED-INCS) $(INCDIR)lispemul.h $(INCDIR)arith.h \ @@ -622,10 +621,10 @@ $(OBJECTDIR)keytstno.o : $(SRCDIR)keytstno.c $(REQUIRED-INCS) $(OBJECTDIR)lsthandl.o : $(SRCDIR)lsthandl.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)emlglob.h $(INCDIR)lspglob.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h \ - $(INCDIR)cell.h $(INCDIR)car-cdr.h + $(INCDIR)cell.h $(CC) $(RFLAGS) $(SRCDIR)lsthandl.c $(INLINE) -o $(OBJECTDIR)lsthandl$(OEXT) -$(OBJECTDIR)llstk.o : $(SRCDIR)llstk.c $(INCDIR)llstk.h $(REQUIRED-INCS) $(INCDIR)lispemul.h \ +$(OBJECTDIR)llstk.o : $(SRCDIR)llstk.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)adr68k.h \ $(INCDIR)address.h $(INCDIR)lsptypes.h $(INCDIR)initatms.h \ $(INCDIR)lspglob.h $(INCDIR)emlglob.h $(INCDIR)cell.h \ @@ -644,7 +643,7 @@ $(OBJECTDIR)loopsops.o : $(SRCDIR)loopsops.c $(REQUIRED-INCS) $(INCDIR)lispemul $(INCDIR)emlglob.h $(INCDIR)address.h $(INCDIR)lsptypes.h \ $(INCDIR)adr68k.h $(INCDIR)cell.h $(INCDIR)lspglob.h \ $(INCDIR)lispmap.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \ - $(INCDIR)debug.h $(INCDIR)profile.h $(INCDIR)car-cdr.h + $(INCDIR)debug.h $(INCDIR)profile.h $(CC) $(RFLAGS) $(SRCDIR)loopsops.c $(INLINE) -o $(OBJECTDIR)loopsops$(OEXT) $(OBJECTDIR)lowlev1.o : $(SRCDIR)lowlev1.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -666,7 +665,7 @@ $(OBJECTDIR)misc7.o : $(SRCDIR)misc7.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(OBJECTDIR)mvs.o : $(SRCDIR)mvs.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lspglob.h $(INCDIR)adr68k.h \ $(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h \ - $(INCDIR)stack.h $(INCDIR)opcodes.h $(INCDIR)car-cdr.h $(INCDIR)conspage.h + $(INCDIR)stack.h $(INCDIR)opcodes.h $(CC) $(RFLAGS) $(SRCDIR)mvs.c $(INLINE) -o $(OBJECTDIR)mvs$(OEXT) $(OBJECTDIR)mkatom.o : $(SRCDIR)mkatom.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -689,7 +688,7 @@ $(OBJECTDIR)return.o : $(SRCDIR)return.c $(REQUIRED-INCS) $(INCDIR)lispemul.h $(OBJECTDIR)rplcons.o : $(SRCDIR)rplcons.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)emlglob.h $(INCDIR)lspglob.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h \ - $(INCDIR)gc.h $(INCDIR)cell.h $(INCDIR)conspage.h + $(INCDIR)gc.h $(INCDIR)cell.h $(CC) $(RFLAGS) $(SRCDIR)rplcons.c $(INLINE) -o $(OBJECTDIR)rplcons$(OEXT) $(OBJECTDIR)rs232c.o : $(SRCDIR)rs232c.c $(REQUIRED-INCS) $(INCDIR)rs232c.h @@ -701,11 +700,11 @@ $(OBJECTDIR)shift.o : $(SRCDIR)shift.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)arith.h $(INCDIR)fp.h $(CC) $(RFLAGS) $(SRCDIR)shift.c $(INLINE) -o $(OBJECTDIR)shift$(OEXT) -$(OBJECTDIR)storage.o : $(SRCDIR)storage.c $(INCDIR)storage.h $(REQUIRED-INCS) $(INCDIR)hdw_conf.h \ +$(OBJECTDIR)storage.o : $(SRCDIR)storage.c $(REQUIRED-INCS) $(INCDIR)hdw_conf.h \ $(INCDIR)lispemul.h $(INCDIR)address.h \ $(INCDIR)adr68k.h $(INCDIR)lispmap.h $(INCDIR)stack.h \ $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)lsptypes.h \ - $(INCDIR)ifpage.h $(INCDIR)car-cdr.h + $(INCDIR)ifpage.h $(CC) $(RFLAGS) $(SRCDIR)storage.c $(INLINE) -o $(OBJECTDIR)storage$(OEXT) $(OBJECTDIR)subr.o : $(SRCDIR)subr.c $(REQUIRED-INCS) \ @@ -713,8 +712,8 @@ $(OBJECTDIR)subr.o : $(SRCDIR)subr.c $(REQUIRED-INCS) \ $(INCDIR)adr68k.h $(INCDIR)subrs.h \ $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)emlglob.h \ $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)stack.h \ - $(INCDIR)arith.h $(INCDIR)profile.h $(INCDIR)dsk.h $(INCDIR)dir.h $(INCDIR)ufs.h \ - $(INCDIR)chardev.h $(INCDIR)dspsubrs.h $(INCDIR)storage.h $(INCDIR)bbtsub.h + $(INCDIR)arith.h $(INCDIR)profile.h \ + $(INCDIR)bbtsub.h $(CC) $(RFLAGS) $(SRCDIR)subr.c $(INLINE) -o $(OBJECTDIR)subr$(OEXT) $(OBJECTDIR)miscn.o : $(SRCDIR)miscn.c $(REQUIRED-INCS) \ @@ -762,8 +761,8 @@ $(OBJECTDIR)unixcomm.o : $(SRCDIR)unixcomm.c $(REQUIRED-INCS) $(INCDIR)lispemu $(OBJECTDIR)uraid.o : $(SRCDIR)uraid.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)emlglob.h \ - $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)llstk.h \ - $(INCDIR)debug.h $(INCDIR)uraid.h + $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)stack.h \ + $(INCDIR)debug.h $(CC) $(RFLAGS) $(SRCDIR)uraid.c $(INLINE) -o $(OBJECTDIR)uraid$(OEXT) $(OBJECTDIR)rpc.o : $(SRCDIR)rpc.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -776,18 +775,18 @@ $(OBJECTDIR)rpc.o : $(SRCDIR)rpc.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(OBJECTDIR)unwind.o : $(SRCDIR)unwind.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \ - $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)uraid.h + $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(CC) $(RFLAGS) $(SRCDIR)unwind.c $(INLINE) -o $(OBJECTDIR)unwind$(OEXT) $(OBJECTDIR)vars3.o : $(SRCDIR)vars3.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lspglob.h $(INCDIR)lispmap.h \ $(INCDIR)adr68k.h $(INCDIR)emlglob.h $(INCDIR)cell.h \ - $(INCDIR)lsptypes.h $(INCDIR)stack.h $(INCDIR)car-cdr.h + $(INCDIR)lsptypes.h $(INCDIR)stack.h $(CC) $(RFLAGS) $(SRCDIR)vars3.c $(INLINE) -o $(OBJECTDIR)vars3$(OEXT) $(OBJECTDIR)vmemsave.o : $(SRCDIR)vmemsave.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)lspglob.h \ - $(INCDIR)ifpage.h $(INCDIR)dsk.h $(INCDIR)vmemsave.h $(INCDIR)dir.h $(INCDIR)ufs.h + $(INCDIR)ifpage.h $(INCDIR)vmemsave.h $(CC) $(RFLAGS) $(SRCDIR)vmemsave.c $(INLINE) -o $(OBJECTDIR)vmemsave$(OEXT) $(OBJECTDIR)array2.o : $(SRCDIR)array2.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -819,7 +818,7 @@ $(OBJECTDIR)socdvr.o : $(SRCDIR)socdvr.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(OBJECTDIR)sxhash.o : $(SRCDIR)sxhash.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lspglob.h $(INCDIR)adr68k.h \ $(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h \ - $(INCDIR)arith.h $(INCDIR)car-cdr.h + $(INCDIR)arith.h $(CC) $(RFLAGS) $(SRCDIR)sxhash.c $(INLINE) -o $(OBJECTDIR)sxhash$(OEXT) $(OBJECTDIR)usrsubr.o : $(SRCDIR)usrsubr.c $(REQUIRED-INCS) diff --git a/inc/car-cdr.h b/inc/car-cdr.h deleted file mode 100644 index 47afdf1..0000000 --- a/inc/car-cdr.h +++ /dev/null @@ -1,9 +0,0 @@ -LispPTR car(register LispPTR datum); -LispPTR cdr(register LispPTR datum); -LispPTR rplaca(register LispPTR x, register LispPTR y); -LispPTR rplacd(LispPTR x, register LispPTR y); -LispPTR N_OP_car(register LispPTR tos); -LispPTR N_OP_cdr(register LispPTR tos); -LispPTR N_OP_rplaca(register LispPTR tosm1, register LispPTR tos); -LispPTR N_OP_rplacd(register LispPTR tosm1, register LispPTR tos); -ConsCell *find_close_prior_cell(struct conspage *page, LispPTR oldcell); /* XXX why not in conspage? */ diff --git a/inc/chardev.h b/inc/chardev.h deleted file mode 100644 index f6aeeae..0000000 --- a/inc/chardev.h +++ /dev/null @@ -1,7 +0,0 @@ -LispPTR CHAR_openfile(LispPTR *args); -LispPTR CHAR_closefile(LispPTR *args); -LispPTR CHAR_ioctl(LispPTR *args); -LispPTR CHAR_bin(int id, LispPTR errn); -LispPTR CHAR_bout(int id, LispPTR ch, LispPTR errn); -LispPTR CHAR_bins(LispPTR *args); -LispPTR CHAR_bouts(LispPTR *args); diff --git a/inc/conspage.h b/inc/conspage.h deleted file mode 100644 index 2218e99..0000000 --- a/inc/conspage.h +++ /dev/null @@ -1,3 +0,0 @@ -struct conspage *next_conspage(void); -LispPTR N_OP_cons(register int cons_car, register int cons_cdr); -LispPTR cons(LispPTR cons_car, LispPTR cons_cdr); diff --git a/inc/dir.h b/inc/dir.h deleted file mode 100644 index 32f457d..0000000 --- a/inc/dir.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifdef DOS -int make_old_version(char *old, char *file); -#endif -#ifdef FSDEBUG -void print_finfo(FINFO *fp); -#endif -int init_finfo(); -LispPTR COM_gen_files(register LispPTR *args); -LispPTR COM_next_file(register LispPTR *args); -LispPTR COM_finish_finfo(register LispPTR *args); diff --git a/inc/dsk.h b/inc/dsk.h deleted file mode 100644 index df895b7..0000000 --- a/inc/dsk.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifdef DOS -void separate_host(char *lfname, char *host, char *drive); -#else -void separate_host(char *lfname, char *host); -#endif -LispPTR COM_openfile(register LispPTR *args); -LispPTR COM_closefile(register LispPTR *args); -LispPTR DSK_getfilename(register LispPTR *args); -LispPTR DSK_deletefile(register LispPTR *args); -LispPTR DSK_renamefile(register LispPTR *args); -LispPTR DSK_directorynamep(register LispPTR *args); -LispPTR COM_getfileinfo(register LispPTR *args); -LispPTR COM_setfileinfo(register LispPTR *args); -LispPTR COM_readpage(register LispPTR *args); -LispPTR COM_writepage(register LispPTR *args); -LispPTR COM_truncatefile(register LispPTR *args); -LispPTR COM_changedir(register LispPTR *args); -LispPTR COM_getfreeblock(register LispPTR *args); -void separate_version(char *name, char *ver, int checkp); -int unpack_filename(char *file, char *dir, char *name, char *ver, int checkp); -int true_name(register char *path); diff --git a/inc/dspsubrs.h b/inc/dspsubrs.h deleted file mode 100644 index 2e157fc..0000000 --- a/inc/dspsubrs.h +++ /dev/null @@ -1,8 +0,0 @@ -void DSP_dspbout(LispPTR *args); -void DSP_showdisplay(LispPTR *args); -LispPTR DSP_VideoColor(LispPTR *args); -void DSP_Cursor(LispPTR *args, int argnum); -void DSP_SetMousePos(register LispPTR *args); -LispPTR DSP_ScreenWidth(LispPTR *args); -LispPTR DSP_ScreenHight(LispPTR *args); -void flip_cursor(); diff --git a/inc/llstk.h b/inc/llstk.h deleted file mode 100644 index 6e44f87..0000000 --- a/inc/llstk.h +++ /dev/null @@ -1,11 +0,0 @@ -DLword *freestackblock(DLword n, StackWord *start68k, int align); -int do_stackoverflow(int incallp); -void decusecount68k(register FX *frame68k); -void flip_cursorbar(int n); -void blt(register DLword *dest68k, register DLword *source68k, int nw); -void stack_check(StackWord *start68k); -void walk_stack(StackWord *start68k); -void quick_stack_check(void); -void check_FX(FX *fx68k); -void check_BF(Bframe *bf68k); -int check_stack_rooms(FX *fx68k); diff --git a/inc/storage.h b/inc/storage.h deleted file mode 100644 index 6a9992b..0000000 --- a/inc/storage.h +++ /dev/null @@ -1,4 +0,0 @@ -void checkfor_storagefull(register unsigned int npages); -LispPTR dremove(LispPTR x, LispPTR l); -LispPTR newpage(LispPTR base); -void init_storage(void); diff --git a/inc/ufs.h b/inc/ufs.h deleted file mode 100644 index db0c502..0000000 --- a/inc/ufs.h +++ /dev/null @@ -1,13 +0,0 @@ -LispPTR UFS_getfilename(LispPTR *args); -LispPTR UFS_deletefile(LispPTR *args); -LispPTR UFS_renamefile(LispPTR *args); -LispPTR UFS_directorynamep(LispPTR *args); -#ifdef DOS -int unixpathname(char *src, char *dst, int versionp, int genp, char *drive, int *extlenptr, char *rawname); -#else -int unixpathname(char *src, char *dst, int versionp, int genp); -#endif -int lisppathname(char *fullname, char *lispname, int dirp, int versionp); -int quote_fname(char *file); -int quote_fname_ufs(char *file); -int quote_dname(char *dir); diff --git a/inc/uraid.h b/inc/uraid.h deleted file mode 100644 index 838597e..0000000 --- a/inc/uraid.h +++ /dev/null @@ -1,6 +0,0 @@ -LispPTR parse_atomstring(char *string); -void uraid_commclear(); -void copy_region(short *src, short *dst, int width, int h); -LispPTR uraid_commands(); -int device_before_raid(); -int device_after_raid();