Mercurial > hg > Members > kono > nitros9-code

changeset 2854:87130746d4d9 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefiles: Avoid duplicates in command sets to copy This was causing hundreds of "copy: error 218" build errors.
author Tormod Volden <debian.tormod@gmail.com>
date Sat, 13 Jul 2013 01:28:39 +0200
parents 49f96d5e8169
children e126b9acab32
files level1/cmds/makefile level1/coco1/cmds/makefile level1/coco1/makefile level1/d64/cmds/makefile level1/dalpha/cmds/makefile level2/coco3/cmds/makefile level2/coco3/makefile
diffstat 7 files changed, 23 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/level1/cmds/makefile	Fri Jul 12 23:58:45 2013 +0200
+++ b/level1/cmds/makefile	Sat Jul 13 01:28:39 2013 +0200
@@ -68,7 +68,7 @@
 	@$(ECHO) $(CMDS) $(SUBS)
 
 showdragonobjs:
-	@$(ECHO) $(CMDS) $(DRAGONCMDS)
+	@$(ECHO) $(sort $(CMDS) $(DRAGONCMDS))
 
 showdragon525objs:
 	@$(ECHO) $(DRAGON525CMDS) $(SUBS)
--- a/level1/coco1/cmds/makefile	Fri Jul 12 23:58:45 2013 +0200
+++ b/level1/coco1/cmds/makefile	Sat Jul 13 01:28:39 2013 +0200
@@ -52,7 +52,7 @@
 	@$(ECHO) $(CMDS_D2)
 
 showobjs_dw:
-	@$(ECHO) $(CMDS) $(CMDS_DW)
+	@$(ECHO) $(sort $(CMDS) $(CMDS_DW))
 
 showallobjs:
 	@$(ECHO) $(ALLOBJS)
--- a/level1/coco1/makefile	Fri Jul 12 23:58:45 2013 +0200
+++ b/level1/coco1/makefile	Sat Jul 13 01:28:39 2013 +0200
@@ -105,10 +105,8 @@
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
 	$(MAKDIR) $@,WWWROOT
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_DW),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS_DW) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS_DW) $(CMDS_D2)),$@,CMDS/$(file))
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
@@ -161,10 +159,8 @@
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
 	$(MAKDIR) $@,WWWROOT
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_DW),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS_DW) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS_DW) $(CMDS_D2)),$@,CMDS/$(file))
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
@@ -217,10 +213,8 @@
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
 	$(MAKDIR) $@,WWWROOT
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_DW),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS_DW) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS_DW) $(CMDS_D2)),$@,CMDS/$(file))
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
@@ -273,10 +267,8 @@
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
 	$(MAKDIR) $@,WWWROOT
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_DW),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS_DW) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS_DW) $(CMDS_D2)),$@,CMDS/$(file))
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
@@ -329,10 +321,8 @@
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
 	$(MAKDIR) $@,WWWROOT
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_DW),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS_DW) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS_DW) $(CMDS_D2)),$@,CMDS/$(file))
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
@@ -385,10 +375,8 @@
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
 	$(MAKDIR) $@,WWWROOT
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_DW),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS_DW) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS_DW) $(CMDS_D2)),$@,CMDS/$(file))
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
@@ -500,10 +488,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS) $(CMDS_D2)),$@,CMDS/$(file))
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
--- a/level1/d64/cmds/makefile	Fri Jul 12 23:58:45 2013 +0200
+++ b/level1/d64/cmds/makefile	Sat Jul 13 01:28:39 2013 +0200
@@ -70,7 +70,7 @@
 	@$(ECHO) $(CMDS) $(SUBS)
 
 showdragonobjs:
-	@$(ECHO) $(CMDS) $(DRAGONCMDS)
+	@$(ECHO) $(sort $(CMDS) $(DRAGONCMDS))
 
 showdragon525objs:
 	@$(ECHO) $(DRAGON525CMDS) $(SUBS)
--- a/level1/dalpha/cmds/makefile	Fri Jul 12 23:58:45 2013 +0200
+++ b/level1/dalpha/cmds/makefile	Sat Jul 13 01:28:39 2013 +0200
@@ -68,7 +68,7 @@
 	@$(ECHO) $(CMDS) $(SUBS)
 
 showdragonobjs:
-	@$(ECHO) $(CMDS) $(DRAGONCMDS)
+	@$(ECHO) $(sort $(CMDS) $(DRAGONCMDS))
 
 showdragon525objs:
 	@$(ECHO) $(DRAGON525CMDS) $(SUBS)
--- a/level2/coco3/cmds/makefile	Fri Jul 12 23:58:45 2013 +0200
+++ b/level2/coco3/cmds/makefile	Sat Jul 13 01:28:39 2013 +0200
@@ -73,7 +73,7 @@
 	@$(ECHO) shell utilpak1 $(CMDS)
 
 showobjs_dw:
-	@$(ECHO) shell utilpak1 $(CMDS) $(CMDS_D2) $(CMDS_DW)
+	@$(ECHO) shell utilpak1 $(sort $(CMDS) $(CMDS_D2) $(CMDS_DW))
 
 showobjs_d2:
 	@$(ECHO) $(CMDS_D2)
--- a/level2/coco3/makefile	Fri Jul 12 23:58:45 2013 +0200
+++ b/level2/coco3/makefile	Sat Jul 13 01:28:39 2013 +0200
@@ -585,10 +585,8 @@
 	$(CP) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS) $(CMDS_D2)),$@,CMDS/$(file))
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYSBIN),$@,SYS/$(file))
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
@@ -641,10 +639,8 @@
 	$(CP) modules/$(CCBKRN) $@,$(CCBKRN)
 	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(CP) $(sort $(CMDS) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS) $(CMDS_D2)),$@,CMDS/$(file))
 	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYSBIN),$@,SYS/$(file))
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS