Changeset 119

Timestamp:

May 10, 2003, 9:25:06 PM (22 years ago)

Author:

bird

Message:

Added rules. Removed $(OUT) dependency on genrules.smak. Changed echo.exe to echo to speed up output.

File:

• trunk/src/emx/Makefile (modified) (3 diffs, 1 prop)

trunk/src/emx/Makefile

@@ -117 +117 @@
 ECHOIZE = $(subst $$,\$$,$1$(strip $(subst $(SPACE)$(COMMA),$(COMMA),$(foreach x,2 3 4 5 6 7 8 9,$(if $($x),$(COMMA) $($x))))))
 # How to output a text string (with appended newline)
-ECHO = echo.exe "$(call ECHOIZE,$1,$2,$3,$4,$5,$6,$7,$8,$9)"
+# bird: skip the .exe and ash will use internal echo implementation which is way faster
+#ECHO = echo.exe "$(call ECHOIZE,$1,$2,$3,$4,$5,$6,$7,$8,$9)"
+ECHO = echo "$(call ECHOIZE,$1,$2,$3,$4,$5,$6,$7,$8,$9)"
 # Same but append the text to a file (given with first argument)
-FECHO = echo.exe "$(call ECHOIZE,$2,$3,$4,$5,$6,$7,$8,$9)" >> "$1"
+# bird: skip the .exe and ash will use internal echo implementation which is way faster
+#FECHO = echo.exe "$(call ECHOIZE,$2,$3,$4,$5,$6,$7,$8,$9)" >> "$1"
+FECHO = echo "$(call ECHOIZE,$2,$3,$4,$5,$6,$7,$8,$9)" >> "$1"
 # How to replace the source file extension with a .o extension
 OBJEXT = $(patsubst %.s,%.o,$(patsubst %.asm,%.o,$(patsubst %.c,%.o,$1)))
@@ -188 +192 @@
         $(call MKDIR,$@)
 
-$(OUT)genrules.smak: $(OUT) Makefile $(SUBMAK)
-        @$(call ECHO,Please wait, rebuilding make rules ...)
+# bird: add rule for generating the rules.
+rules: rules-rm $(OUT)genrules.smak
+rules-rm:
+        @$(call RM,$(OUT)genrules.smak)
+        
+#$(OUT)genrules.smak: $(OUT) Makefile $(SUBMAK)
+# bird: depeding on $(OUT) make it unstable.
+$(OUT)genrules.smak: Makefile $(SUBMAK)
+        $(call MKDIR,$(@D))
+        @$(call ECHO,Please wait, rebuilding make rules $@ ...)
         @$(call RM,$@)
         @$(call FECHO,$@,# Autogenerated file -- DO NOT EDIT!)
@@ -195 +207 @@
 
 -include $(OUT)genrules.smak
+