Mercurial > hg > Members > kono > nitros9-code

changeset 2767:51a38eaee97a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Thanks to Bill P for finding that wrong sys lib was being used in the level2/coco3/cmds/makefile Renamed the level2/coco3/cmds/makefile to makefile_common Then removed the the sys6809l1.l file from the makefile_common and then created a new makefile which would add this to the LFLAGS and then include makefile_common. Found that level2/coco3_6309/cmds/makefile was including level2/coco3/cmds/makefile which means that it was also using sys6809l1.l as a linked in library. Updated level2/coco3_6309/cmds/makefile so that it includes level2/coco3/cmds/makefile_common and adds the sys6309l2.l using the LFLAGS option.
author drencor-xeen
date Thu, 17 Jan 2013 20:08:48 -0600
parents 947ed392ce63
children 57b3108c144d
files ChangeLog level2/coco3/cmds/makefile level2/coco3/cmds/makefile_common level2/coco3_6309/cmds/makefile
diffstat 4 files changed, 110 insertions(+), 76 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 17 11:53:30 2013 -0600
+++ b/ChangeLog	Thu Jan 17 20:08:48 2013 -0600
@@ -3,6 +3,32 @@
 ----------------------------------------------------------
 2013/01/17 David Ladd
 M ChangeLog
+M level2/coco3/cmds/makefile
+M level2/coco3_6309/cmds/makefile
+A level2/coco3/cmds/makefile_common
+
+Thanks to Bill P. for finding that the commands in
+level2/coco3/cmds were being linked with sys6809l1.l when
+they should have been being linked with sys6809l2.l .
+Also found that the level2/coco3_6309/cmds were also
+using the makefile from the level2/coco3/cmds so that
+section was also using the sys6809l1.l for linking.
+
+Renamed level2/coco3/cmds/makefile to makefile_common then
+created a new makefile which calls makefile_common then
+does a LFLAGS          += -l=$(NITROS9DIR)/lib/sys6809l2.l
+and then removed the -l=$(NITROS9DIR)/lib/sys6809l1.l from
+the makefile_common.
+
+Then updated the level2/coco3_6309/makefile to include
+level2/coco3/cmds/makefile_common rather than makefile.
+Then added to level2/coco3_6309/makefile the new line
+LFLAGS          += -l=$(NITROS9DIR)/lib/sys6309l2.l
+and should fix any lose ends there.
+
+----------------------------------------------------------
+2013/01/17 David Ladd
+M ChangeLog
 M rules.mak
 
 Updated the rules.mak so that all os9 format commands will
--- a/level2/coco3/cmds/makefile	Thu Jan 17 11:53:30 2013 -0600
+++ b/level2/coco3/cmds/makefile	Thu Jan 17 20:08:48 2013 -0600
@@ -1,78 +1,6 @@
-PORT = coco3
-ifndef  NITROS9DIR
+ifndef NITROS9DIR
 NITROS9DIR      = $(HOME)/nitros9
 endif
 include $(NITROS9DIR)/rules.mak
-
-vpath %.a $(LEVEL2)/cmds:$(LEVEL1)/cmds
-vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
-
-DEPENDS		= ./makefile
-AFLAGS          += -i=$(NITROS9DIR)/3rdparty/packages/basic09
-LFLAGS		+= -l=$(NITROS9DIR)/lib/net.l -l=$(NITROS9DIR)/lib/alib.l -l=$(NITROS9DIR)/lib/sys6809l1.l
-
-CMDS		= asm attr backup binex build cmp cobbler copy cputype \
-		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
-		display dmem dmode dsave dump echo edit error exbin \
-		format free grfdrv help ident iniz irqs link list load login \
-		makdir mdir megaread merge mfree mmap modpatch montype mpi os9gen padrom park \
-		pmap proc procs prompt pwd pxd reboot rename save setime \
-		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode
-
-CMDS_D2         = basic09 runb gfx2 gfx inkey syscall copy del echo format \
-                merge os9gen prompt tmode
-
-CMDS_DW		= inetd dw telnet
-
-SHELLMODS	= shellplus date deiniz echo iniz link load save unlink
-UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
-		merge mfree procs rename tmode
-
-# Files not compilable by os9asm: config
-all:	$(CMDS) $(CMDS_D2) $(CMDS_DW) shell utilpak1 $(DEPENDS)
-
-runb:	runb.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
-	$(MERGE) $@ $(SUBS)>$@.tmp
-	$(RM) $@
-	$(MOVE) $@.tmp $@
-
-tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
-
-xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
-
-pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
-
-pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
-
-shell:  $(SHELLMODS) $(DEPENDS)
-	$(MERGE) $(SHELLMODS)>$@
-	@$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***"
-	@ls -l $@
-	@$(ECHO) ""
-
-utilpak1:  $(UTILPAK1) $(DEPENDS)
-	$(MERGE) $(UTILPAK1)>$@
-	@$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***"
-	@ls -l $@
-	@$(ECHO) ""
-
-clean:
-	$(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS) $(CMDS_D2) $(CMDS_DW)
-
-# Only $(CMDS) are shown here
-showobjs:
-	@$(ECHO) shell utilpak1 $(CMDS)
-
-showobjs_dw:
-	@$(ECHO) shell utilpak1 $(CMDS) $(CMDS_DW)
-
-showobjs_d2:
-	@$(ECHO) $(CMDS_D2)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
+include makefile_common
+LFLAGS          += -l=$(NITROS9DIR)/lib/sys6809l2.l
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level2/coco3/cmds/makefile_common	Thu Jan 17 20:08:48 2013 -0600
@@ -0,0 +1,75 @@
+PORT = coco3
+
+vpath %.a $(LEVEL2)/cmds:$(LEVEL1)/cmds
+vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
+
+DEPENDS		= ./makefile
+AFLAGS          += -i=$(NITROS9DIR)/3rdparty/packages/basic09
+LFLAGS		+= -l=$(NITROS9DIR)/lib/net.l -l=$(NITROS9DIR)/lib/alib.l
+# -l=$(NITROS9DIR)/lib/sys6809l2.l
+
+CMDS		= asm attr backup binex build cmp cobbler copy cputype \
+		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
+		display dmem dmode dsave dump echo edit error exbin \
+		format free grfdrv help ident iniz irqs link list load login \
+		makdir mdir megaread merge mfree mmap modpatch montype mpi os9gen padrom park \
+		pmap proc procs prompt pwd pxd reboot rename save setime \
+		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode
+
+CMDS_D2         = basic09 runb gfx2 gfx inkey syscall copy del echo format \
+                merge os9gen prompt tmode
+
+CMDS_DW		= inetd dw telnet
+
+SHELLMODS	= shellplus date deiniz echo iniz link load save unlink
+UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
+		merge mfree procs rename tmode
+
+# Files not compilable by os9asm: config
+all:	$(CMDS) $(CMDS_D2) $(CMDS_DW) shell utilpak1 $(DEPENDS)
+
+runb:	runb.asm
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(MERGE) $@ $(SUBS)>$@.tmp
+	$(RM) $@
+	$(MOVE) $@.tmp $@
+
+tmode:	xmode.asm
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
+
+xmode:	xmode.asm
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
+
+pwd:	pd.asm
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+
+pxd:	pd.asm
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
+
+shell:  $(SHELLMODS) $(DEPENDS)
+	$(MERGE) $(SHELLMODS)>$@
+	@$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***"
+	@ls -l $@
+	@$(ECHO) ""
+
+utilpak1:  $(UTILPAK1) $(DEPENDS)
+	$(MERGE) $(UTILPAK1)>$@
+	@$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***"
+	@ls -l $@
+	@$(ECHO) ""
+
+clean:
+	$(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS) $(CMDS_D2) $(CMDS_DW)
+
+# Only $(CMDS) are shown here
+showobjs:
+	@$(ECHO) shell utilpak1 $(CMDS)
+
+showobjs_dw:
+	@$(ECHO) shell utilpak1 $(CMDS) $(CMDS_DW)
+
+showobjs_d2:
+	@$(ECHO) $(CMDS_D2)
+
+identify:
+	$(IDENT_SHORT) $(ALLOBJS)
--- a/level2/coco3_6309/cmds/makefile	Thu Jan 17 11:53:30 2013 -0600
+++ b/level2/coco3_6309/cmds/makefile	Thu Jan 17 20:08:48 2013 -0600
@@ -1,2 +1,7 @@
-include ../../coco3/cmds/makefile
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
+include ../../coco3/cmds/makefile_common
 AFLAGS          += -e -aH6309=1
+LFLAGS		+= -l=$(NITROS9DIR)/lib/sys6309l2.l