From 3223ef2839bb2d59465e4f679675d8e4de4fc3e5 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Fri, 5 May 2023 14:02:30 -0700 Subject: [PATCH] Remove now unnecessary hdw_conf.h and all references in makefile fragments and CMakeLists.txt --- CMakeLists.txt | 1 - bin/makefile-dos | 2 +- bin/makefile-tail | 8 ++++---- inc/hdw_conf.h | 39 --------------------------------------- 4 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 inc/hdw_conf.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 957bc00..8a1b369 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -292,7 +292,6 @@ SET(MAIKO_HDRS inc/gcscandefs.h inc/gvar2defs.h inc/hardrtndefs.h - inc/hdw_conf.h inc/ifpage.h inc/inetdefs.h inc/initatms.h diff --git a/bin/makefile-dos b/bin/makefile-dos index d08f140..f4cd82f 100644 --- a/bin/makefile-dos +++ b/bin/makefile-dos @@ -18,7 +18,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk. OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj gcr.obj gcrcell.obj llstk.obj gcscan.obj loopsops.obj storage.obj allocmds.obj dir.obj gvar2.obj lowlev1.obj subr.obj arithops.obj lowlev2.obj subr0374.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj dsk.obj inet.obj misc7.obj timer.obj array2.obj dspif.obj initdsp.obj miscn.obj typeof.obj array3.obj initkbd.obj ubf1.obj array4.obj dspsubrs.obj initsout.obj mkatom.obj ubf2.obj array5.obj eqf.obj intcall.obj mkcell.obj ubf3.obj array6.obj ether.obj ufn.obj atom.obj findkey.obj kbdsubrs.obj mouseif.obj ufs.obj bbtsub.obj foreign.obj keyevent.obj unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj unwind.obj bitblt.obj gc.obj uraid.obj blt.obj gc2.obj kprint.obj osmsg.obj usrsubr.obj byteswap.obj gcarray.obj perrno.obj uutils.obj carcdr.obj asmbbt.obj gccode.obj vars3.obj gcfinal.obj ldsout.obj return.obj vmemsave.obj chardev.obj gchtfind.obj lineblt8.obj rpc.obj xc.obj common.obj gcmain3.obj lisp2c.obj rplcons.obj z2.obj vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES) -HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h iopage.h lispemul.h lispmap.h lsptypes.h miscstat.h lspglob.h array.h bb.h bitblt.h debug.h devconf.h dspdata.h ether.h fast_dsp.h gcdata.h hdw_conf.h initatms.h inlinec.h keyboard.h lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h tos1defs.h tosfns.h tosret.h vmemsave.h xdefs.h xbitmaps.h xkeymap.h +HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h iopage.h lispemul.h lispmap.h lsptypes.h miscstat.h lspglob.h array.h bb.h bitblt.h debug.h devconf.h dspdata.h ether.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h tos1defs.h tosfns.h tosret.h vmemsave.h xdefs.h xbitmaps.h xkeymap.h diff --git a/bin/makefile-tail b/bin/makefile-tail index 94ebb75..4036904 100644 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -324,7 +324,7 @@ $(OBJECTDIR)blt.o: $(SRCDIR)blt.c $(REQUIRED-INCS) \ $(CC) $(RFLAGS) $(SRCDIR)blt.c -o $(OBJECTDIR)blt.o $(OBJECTDIR)byteswap.o: $(SRCDIR)byteswap.c $(REQUIRED-INCS) \ - $(INCDIR)hdw_conf.h $(INCDIR)lispemul.h \ + $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)stack.h \ $(INCDIR)byteswapdefs.h $(CC) $(RFLAGS) $(SRCDIR)byteswap.c -o $(OBJECTDIR)byteswap.o @@ -663,7 +663,7 @@ $(OBJECTDIR)initkbd.o: $(SRCDIR)initkbd.c $(REQUIRED-INCS) \ $(CC) $(RFLAGS) $(SRCDIR)initkbd.c -o $(OBJECTDIR)initkbd.o $(OBJECTDIR)initsout.o: $(SRCDIR)initsout.c $(REQUIRED-INCS) \ - $(INCDIR)hdw_conf.h $(INCDIR)lispemul.h \ + $(INCDIR)lispemul.h \ $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \ $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)adr68k.h $(INCDIR)cell.h \ $(INCDIR)devconf.h $(INCDIR)dbprint.h $(INCDIR)lldsp.h $(INCDIR)gcdata.h \ @@ -789,7 +789,7 @@ $(OBJECTDIR)shift.o: $(SRCDIR)shift.c $(REQUIRED-INCS) \ $(CC) $(RFLAGS) $(SRCDIR)shift.c -o $(OBJECTDIR)shift.o $(OBJECTDIR)storage.o: $(SRCDIR)storage.c $(REQUIRED-INCS) \ - $(INCDIR)hdw_conf.h $(INCDIR)lispemul.h \ + $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lispmap.h $(INCDIR)stack.h \ $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \ $(INCDIR)cell.h $(INCDIR)lsptypes.h $(INCDIR)gcdata.h $(INCDIR)storagedefs.h \ @@ -906,7 +906,7 @@ $(OBJECTDIR)vars3.o: $(SRCDIR)vars3.c $(REQUIRED-INCS) \ $(CC) $(RFLAGS) $(SRCDIR)vars3.c -o $(OBJECTDIR)vars3.o $(OBJECTDIR)vmemsave.o: $(SRCDIR)vmemsave.c $(REQUIRED-INCS) \ - $(INCDIR)hdw_conf.h $(INCDIR)lispemul.h \ + $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \ $(INCDIR)miscstat.h $(INCDIR)vmemsave.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \ diff --git a/inc/hdw_conf.h b/inc/hdw_conf.h deleted file mode 100644 index ce0aa2f..0000000 --- a/inc/hdw_conf.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef HDW_CONF_H -#define HDW_CONF_H 1 -/* $Id: hdw_conf.h,v 1.2 1999/01/03 02:06:01 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - - -/************************************************************************/ -/* */ -/* (C) Copyright 1989-92 Venue. All Rights Reserved. */ -/* Manufactured in the United States of America. */ -/* */ -/************************************************************************/ - - - - -/**************************************************************/ -/* - File name : machineconfig.h - - Created : Aug-19-87 take - - Desc. : Define for Machine dependent param - -*/ -/**************************************************************/ -/* Machine Type */ - -#define KATANA 3 - -/* Lastvmempage(32Mbyte) */ -#ifdef BIGVM -#define LASTVMEMPAGE 0x1FFFF -#else -#define LASTVMEMPAGE (65535) -#endif - -#endif /* HDW_CONF_H */