Mercurial > hg > Members > kono > nitros9-code

changeset 1429:44d21b07a99f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Gettin' mo' betta!
author boisy
date Wed, 03 Dec 2003 00:57:55 +0000
parents 7e0ecb2e394a
children cd27ea66e47b
files 3rdparty/packages/multivue/cmds_6309/makefile 3rdparty/packages/multivue/cmds_6809/defsfile 3rdparty/packages/multivue/cmds_6809/makefile 3rdparty/packages/multivue/makefile
diffstat 4 files changed, 23 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/multivue/cmds_6309/makefile	Wed Dec 03 00:32:24 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6309/makefile	Wed Dec 03 00:57:55 2003 +0000
@@ -1,40 +1,28 @@
 include ../../../../rules.mak
 
-vpath %.asm $(6809L2)/cmds:$(6809L1)/cmds:../cmds_6809
+vpath %.asm ../cmds_6809
 
 AFLAGS		+= -e
 DEPENDS		= ./makefile
 
-CMDS		= shell utilpak1 grfdrv \
-		gshell cocopr control demo fstat \
-		gcal gcalc gclock gport gprint \
-		backup format free help
+OSCMDS		= $(6309L2)/cmds/shell $(6309L2)/cmds/utilpak1 \
+		$(6309L2)/cmds/grfdrv $(6309L2)/cmds/backup \
+		$(6309L2)/cmds/format $(6309L2)/cmds/free $(6309L2)/cmds/help
+CMDS		= gshell cocopr control demo fstat \
+		gcal gcalc gclock gport gprint
 
-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 sleep tmode
+ALLOBJS		= $(OSCMDS) $(CMDS)
 
-ALLOBJS		= $(CMDS)
+all:	cmds $(ALLOBJS)
 
-all:	$(ALLOBJS)
+cmds:
+	$(CD) $(6309L2)/cmds; make
 
 gshell: gshell.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS)
 
-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) $(ALLOBJS)
+	$(RM) $(CMDS)
 
 showobjs:
 	@$(ECHO) $(ALLOBJS)
--- a/3rdparty/packages/multivue/cmds_6809/defsfile	Wed Dec 03 00:32:24 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6809/defsfile	Wed Dec 03 00:57:55 2003 +0000
@@ -1,5 +1,4 @@
 Level    equ   2
          use   os9defs   
          use   scfdefs   
-         use   systype   
          use   rbfdefs   
--- a/3rdparty/packages/multivue/cmds_6809/makefile	Wed Dec 03 00:32:24 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6809/makefile	Wed Dec 03 00:57:55 2003 +0000
@@ -1,39 +1,25 @@
 include ../../../../rules.mak
 
-vpath %.asm $(6809L2)/cmds:$(6809L1)/cmds
-
 DEPENDS		= ./makefile
 
-CMDS		= shell utilpak1 grfdrv \
-		gshell cocopr control demo fstat \
-		gcal gcalc gclock gport gprint \
-		backup format free help
+OSCMDS		= $(6809L2)/cmds/shell $(6809L2)/cmds/utilpak1 \
+		$(6809L2)/cmds/grfdrv $(6809L2)/cmds/backup \
+		$(6809L2)/cmds/format $(6809L2)/cmds/free $(6809L2)/cmds/help
+CMDS		= gshell cocopr control demo fstat \
+		gcal gcalc gclock gport gprint
 
-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 sleep tmode
+ALLOBJS		= $(OSCMDS) $(CMDS)
 
-ALLOBJS		= $(CMDS)
+all:	cmds $(ALLOBJS)
 
-all:	$(ALLOBJS)
+cmds:
+	$(CD) $(6809L2)/cmds; make
 
 gshell: gshell.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS)
 
-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) $(ALLOBJS)
+	$(RM) $(CMDS)
 
 showobjs:
 	@$(ECHO) $(ALLOBJS)
--- a/3rdparty/packages/multivue/makefile	Wed Dec 03 00:32:24 2003 +0000
+++ b/3rdparty/packages/multivue/makefile	Wed Dec 03 00:57:55 2003 +0000
@@ -70,7 +70,7 @@
 	$(MAKDIR) $(DISK68),SYS
 	$(MAKDIR) $(DISK68),DEMO
 	$(CD) cmds_6809; $(CP) $(CMDS68) ../$(DISK68),CMDS
-	$(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $(DISK68),CMDS/$(file);)
+	$(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $(DISK68),CMDS/$(notdir $(file));)
 	$(OS9RENAME) $(DISK68),CMDS/gshell AutoEx
 	$(CD) icons; $(CP) $(ICONS) ../$(DISK68),CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $(DISK68),CMDS/ICONS/$(file);)
@@ -93,7 +93,7 @@
 	$(MAKDIR) $(DISK63),SYS
 	$(MAKDIR) $(DISK63),DEMO
 	$(CD) cmds_6309; $(CP) $(CMDS63) ../$(DISK63),CMDS
-	$(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $(DISK63),CMDS/$(file);)
+	$(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $(DISK63),CMDS/$(notdir $(file));)
 	$(OS9RENAME) $(DISK63),CMDS/gshell AutoEx
 	$(CD) icons; $(CP) $(ICONS) ../$(DISK63),CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $(DISK63),CMDS/ICONS/$(file);)