Mercurial > hg > Members > kono > nitros9-code

changeset 3101:3f3350d0f629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove duplicated and unused sys/makefile instances
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 28 Feb 2016 21:37:47 +0100
parents ed4c9b04f74e
children 13299b970532
files level2/sys/makefile level3/coco3/port.mak level3/coco3/sys/makefile level3/coco3_6309/port.mak level3/coco3_6309/sys/makefile
diffstat 5 files changed, 20 insertions(+), 122 deletions(-) [+]
line wrap: on
line diff
--- a/level2/sys/makefile	Sun Feb 28 21:37:42 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-PORT = coco3
-include ../../rules.mak
-
-vpath %.hp $(LEVEL1)/sys
-
-DEPENDS		= ./makefile
-
-L1TXTFILES	= errmsg password
-L2TXTFILES	= motd
-BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
-		ibmedcfont isolatin1font
-HELPFILES	= asm.hp attr.hp \
-		backup.hp basic09.hp binex.hp build.hp \
-		chd.hp chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp \
-		date.hp dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
-		dir.hp dirsort.hp disasm.hp display.hp dmem.hp dmode.hp dsave.hp dump.hp \
-		echo.hp edit.hp error.hp ex.hp exbin.hp \
-		format.hp free.hp \
-		gfx.hp gfx2.hp grfdrv.hp \
-		help.hp \
-		ident.hp iniz.hp inkey.hp irqs.hp \
-		kill.hp \
-		link.hp list.hp load.hp login.hp \
-		makdir.hp mdir.hp megaread.hp merge.hp mfree.hp mmap.hp modpatch.hp \
-		montype.hp mpi.hp os9gen.hp \
-		padrom.hp park.hp pmap.hp proc.hp procs.hp prompt.hp pwd.hp pxd.hp \
-		reboot.hp rename.hp runb.hp \
-		save.hp setime.hp setpr.hp shell.hp sleep.hp smap.hp \
-		tee.hp tmode.hp touch.hp tsmon.hp tuneport.hp \
-		unlink.hp \
-		verify.hp \
-		wcreate.hp \
-		xmode.hp
-
-#HELPFILES	= make.hp maketerm.hp rdump.hp rlink.hp rma.hp scred.hp
-
-HELPMSG		= helpmsg
-
-TEXTFILES	= $(L2TXTFILES) $(HELPMSG) $(L1TXTFILES)
-ALLOBJS		= $(TEXTFILES) $(BINFILES)
-
-all:	$(ALLOBJS) $(DEPENDS)
-
-$(HELPMSG): $(HELPFILES)
-	$(MERGE) $^ > $@
-
-$(L1TXTFILES):
-	$(SOFTLINK) -f $(LEVEL1)/sys/$@
-
-clean:
-	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES)
-
-showbinobjs:
-	@$(ECHO) $(BINFILES)
-
-showtextobjs:
-	@$(ECHO) $(TEXTFILES)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level3/coco3/port.mak	Sun Feb 28 21:37:47 2016 +0100
@@ -0,0 +1,9 @@
+PORT = coco3
+MACHINE = Tandy Color Computer 3
+CPU = 6809
+LEVEL = 3
+TELNET_PORT = 6809
+HTTPD_PORT = 8809
+
+include $(NITROS9DIR)/rules.mak
+
--- a/level3/coco3/sys/makefile	Sun Feb 28 21:37:42 2016 +0100
+++ b/level3/coco3/sys/makefile	Sun Feb 28 21:37:47 2016 +0100
@@ -1,61 +1,1 @@
-PORT = coco3
-include $(NITROS9DIR)/rules.mak
-
-vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
-vpath %.asm $(LEVEL2)/sys
-
-DEPENDS		= ./makefile
-
-L1TXTFILES	= errmsg password
-L2TXTFILES	= motd
-BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
-		ibmedcfont isolatin1font
-HELPFILES	= asm.hp attr.hp \
-		backup.hp basic09.hp binex.hp build.hp \
-		chd.hp chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp \
-		date.hp dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
-		dir.hp dirsort.hp disasm.hp display.hp dmem.hp dmode.hp dsave.hp dump.hp \
-		echo.hp edit.hp error.hp ex.hp exbin.hp \
-		format.hp free.hp \
-		gfx.hp gfx2.hp grfdrv.hp \
-		help.hp \
-		ident.hp iniz.hp inkey.hp irqs.hp \
-		kill.hp \
-		link.hp list.hp load.hp login.hp \
-		makdir.hp mdir.hp megaread.hp merge.hp mfree.hp mmap.hp modpatch.hp \
-		montype.hp mpi.hp os9gen.hp \
-		padrom.hp park.hp pmap.hp proc.hp procs.hp prompt.hp pwd.hp pxd.hp \
-		reboot.hp rename.hp runb.hp \
-		save.hp setime.hp setpr.hp shell.hp sleep.hp smap.hp \
-		tee.hp tmode.hp touch.hp tsmon.hp tuneport.hp \
-		unlink.hp \
-		verify.hp \
-		wcreate.hp \
-		xmode.hp
-
-#HELPFILES	= make.hp maketerm.hp rdump.hp rlink.hp rma.hp scred.hp
-
-HELPMSG		= helpmsg
-
-TEXTFILES	= $(L2TXTFILES) $(HELPMSG) $(L1TXTFILES)
-ALLOBJS		= $(TEXTFILES) $(BINFILES)
-
-all:	$(ALLOBJS) $(DEPENDS)
-
-$(HELPMSG): $(HELPFILES)
-	$(MERGE) $^ > $@
-
-$(L1TXTFILES):
-	$(SOFTLINK) -f $(LEVEL1)/sys/$@
-
-clean:
-	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES)
-
-showbinobjs:
-	@$(ECHO) $(BINFILES)
-
-showtextobjs:
-	@$(ECHO) $(TEXTFILES)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
+include ../../../level2/coco3/sys/makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level3/coco3_6309/port.mak	Sun Feb 28 21:37:47 2016 +0100
@@ -0,0 +1,9 @@
+PORT = coco3
+MACHINE = Tandy Color Computer 3
+CPU = 6309
+LEVEL = 3
+TELNET_PORT = 6809
+HTTPD_PORT = 8809
+
+include $(NITROS9DIR)/rules.mak
+
--- a/level3/coco3_6309/sys/makefile	Sun Feb 28 21:37:42 2016 +0100
+++ b/level3/coco3_6309/sys/makefile	Sun Feb 28 21:37:47 2016 +0100
@@ -1,1 +1,1 @@
-include ../../coco3/sys/makefile
+include ../../../level2/coco3/sys/makefile