# HG changeset patch # User Tormod Volden # Date 1373580060 -7200 # Node ID 94197db917c9480ff6b7334ae321ffa25aebc4f3 # Parent d9cf60ca6dc3fb53808b462d571418394d6894ce Makefiles: Call OS9ATTR with multiple files (part 1) Instead of spawning a os9 process for each file, call it once with the whole bunch of files. This can speed up the build process significantly when applied globally. For now, do the special cases having "notdir". diff -r d9cf60ca6dc3 -r 94197db917c9 3rdparty/customboots/boisy/makefile --- a/3rdparty/customboots/boisy/makefile Thu Jul 11 23:42:37 2013 +0200 +++ b/3rdparty/customboots/boisy/makefile Fri Jul 12 00:01:00 2013 +0200 @@ -111,7 +111,7 @@ $(MAKDIR) $@,CMDS $(MAKDIR) $@,SYS $(CP) $(CMDS) $(CMDS_DW) $(CMDS_THESIS) $@,CMDS - $(foreach file, $(CMDS) $(CMDS_DW) $(CMDS_THESIS), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file, $(notdir $(CMDS) $(CMDS_DW) $(CMDS_THESIS)),$@,CMDS/$(file);) $(MAKDIR) $@,SRC $(CPL) $(SRC_THESIS) $@,SRC $(CP) $(3RDPARTY)/utils/supercomm/supercomm $@,CMDS diff -r d9cf60ca6dc3 -r 94197db917c9 3rdparty/packages/deskmate3/makefile --- a/3rdparty/packages/deskmate3/makefile Thu Jul 11 23:42:37 2013 +0200 +++ b/3rdparty/packages/deskmate3/makefile Fri Jul 12 00:01:00 2013 +0200 @@ -46,11 +46,11 @@ $(RM) os9boot kernel $(MAKDIR) $(DISK),CMDS $(CP) $(UTILS) $(DISK),CMDS - $(foreach file, $(UTILS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(UTILS)),$(DISK),CMDS/$(file)) $(CP) $(CMDS) $(DISK),CMDS - $(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS)),$(DISK),CMDS/$(file)) $(CPL) $(HELP) $(DISK),CMDS - $(foreach file, $(HELP), $(OS9ATTR_EXEC) $(DISK),CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(HELP)),$(DISK),CMDS/$(file)) $(CP) $(ROOTFILES) $(DISK),. $(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);) diff -r d9cf60ca6dc3 -r 94197db917c9 3rdparty/packages/multivue/makefile --- a/3rdparty/packages/multivue/makefile Thu Jul 11 23:42:37 2013 +0200 +++ b/3rdparty/packages/multivue/makefile Fri Jul 12 00:01:00 2013 +0200 @@ -131,7 +131,7 @@ $(MAKDIR) $@,SYS $(MAKDIR) $@,DEMO $(CD) cmds_6809; $(CP) $(CMDS68) ../$@,CMDS - $(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68)),$@,CMDS/$(file)) $(OS9RENAME) $@,CMDS/gshell AutoEx $(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS $(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);) @@ -156,7 +156,7 @@ $(MAKDIR) $@,SYS $(MAKDIR) $@,DEMO $(CD) cmds_6309; $(CP) $(CMDS63) ../$@,CMDS - $(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63)),$@,CMDS/$(file)) $(OS9RENAME) $@,CMDS/gshell AutoEx $(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS $(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);) @@ -181,7 +181,7 @@ $(MAKDIR) $@,SYS $(MAKDIR) $@,DEMO $(CD) cmds_6809; $(CP) $(CMDS68) ../$@,CMDS - $(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68)),$@,CMDS/$(file)) $(OS9RENAME) $@,CMDS/gshell AutoEx $(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS $(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);) @@ -206,7 +206,7 @@ $(MAKDIR) $@,SYS $(MAKDIR) $@,DEMO $(CD) cmds_6809; $(CP) $(CMDS68) ../$@,CMDS - $(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68)),$@,CMDS/$(file)) $(OS9RENAME) $@,CMDS/gshell AutoEx $(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS $(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);) @@ -231,7 +231,7 @@ $(MAKDIR) $@,SYS $(MAKDIR) $@,DEMO $(CD) cmds_6309; $(CP) $(CMDS63) ../$@,CMDS - $(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63)),$@,CMDS/$(file)) $(OS9RENAME) $@,CMDS/gshell AutoEx $(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS $(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);) @@ -256,7 +256,7 @@ $(MAKDIR) $@,SYS $(MAKDIR) $@,DEMO $(CD) cmds_6309; $(CP) $(CMDS63) ../$@,CMDS - $(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63)),$@,CMDS/$(file)) $(OS9RENAME) $@,CMDS/gshell AutoEx $(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS $(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);) diff -r d9cf60ca6dc3 -r 94197db917c9 3rdparty/packages/uucpbb/makefile --- a/3rdparty/packages/uucpbb/makefile Thu Jul 11 23:42:37 2013 +0200 +++ b/3rdparty/packages/uucpbb/makefile Fri Jul 12 00:01:00 2013 +0200 @@ -48,9 +48,9 @@ $(CD) sample_config; $(CPL) $(CONFIG) ../$(DISK68),SYS/UUCP $(CPL) profile $(DISK68),SYS $(CD) cmds_6809; $(CP) $(CMDS68TCAP) ../$(DISK68),UUCP/CMDS_TCAP - $(foreach file, $(CMDS68TCAP), $(OS9ATTR_EXEC) $(DISK68),UUCP/CMDS_TCAP/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68TCAP)),$(DISK68),UUCP/CMDS_TCAP/$(file)) $(CD) cmds_6809; $(CP) $(CMDS68WIN) ../$(DISK68),UUCP/CMDS_WIN - $(foreach file, $(CMDS68WIN), $(OS9ATTR_EXEC) $(DISK68),UUCP/CMDS_WIN/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS68WIN)),$(DISK68),UUCP/CMDS_WIN/$(file)) $(CD) doc; $(CPL) $(DOCS) ../$(DISK68),UUCP/DOC $(CPL) copying readme.first $(DISK68),UUCP @@ -73,9 +73,9 @@ $(CD) sample_config; $(CPL) $(CONFIG) ../$(DISK63),SYS/UUCP $(CPL) profile $(DISK63),SYS $(CD) cmds_6309; $(CP) $(CMDS63TCAP) ../$(DISK63),UUCP/CMDS_TCAP - $(foreach file, $(CMDS63TCAP), $(OS9ATTR_EXEC) $(DISK63),UUCP/CMDS_TCAP/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63TCAP)),$(DISK63),UUCP/CMDS_TCAP/$(file)) $(CD) cmds_6309; $(CP) $(CMDS63WIN) ../$(DISK63),UUCP/CMDS_WIN - $(foreach file, $(CMDS63WIN), $(OS9ATTR_EXEC) $(DISK63),UUCP/CMDS_WIN/$(notdir $(file));) + $(OS9ATTR_EXEC) $(foreach file,$(notdir $(CMDS63WIN)),$(DISK63),UUCP/CMDS_WIN/$(file)) $(CD) doc; $(CPL) $(DOCS) ../$(DISK63),UUCP/DOC $(CPL) copying readme.first $(DISK63),UUCP diff -r d9cf60ca6dc3 -r 94197db917c9 level2/coco3/makefile --- a/level2/coco3/makefile Thu Jul 11 23:42:37 2013 +0200 +++ b/level2/coco3/makefile Fri Jul 12 00:01:00 2013 +0200 @@ -126,7 +126,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP_DW) $@,startup @@ -180,7 +180,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP_DW) $@,startup @@ -234,7 +234,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP_DW) $@,startup @@ -288,7 +288,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP_DW) $@,startup @@ -342,7 +342,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP_DW) $@,startup @@ -396,7 +396,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP_DW) $@,startup @@ -450,7 +450,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP_DW) $@,startup @@ -504,7 +504,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP) $@,startup @@ -527,7 +527,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP) $@,startup @@ -592,7 +592,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP) $@,startup @@ -648,7 +648,7 @@ $(CD) sys; $(CP) $(SYSBIN) ../$@,SYS $(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);) $(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS - $(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(notdir $(file));) + $(OS9ATTR_TEXT) $(foreach file,$(notdir $(SYSTEXT)),$@,SYS/$(file)) $(CD) defs; $(CPL) $(DEFS) ../$@,DEFS $(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);) $(CPL) $(STARTUP) $@,startup