diff options
| author | Michael Brown | 2007-08-21 02:53:11 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-08-21 02:53:11 +0200 |
| commit | 8ee7eeb4074f5388c0fab6885e6c1b8b3fa474e4 (patch) | |
| tree | 0cdf1aabecb9002ef835c4f0c7d66ee9416bfc72 /src | |
| parent | Added error IDs for all files in drivers/net; they're likely to need them. (diff) | |
| parent | Added error IDs for all files in drivers/net; they're likely to need them. (diff) | |
| download | ipxe-8ee7eeb4074f5388c0fab6885e6c1b8b3fa474e4.tar.gz ipxe-8ee7eeb4074f5388c0fab6885e6c1b8b3fa474e4.tar.xz ipxe-8ee7eeb4074f5388c0fab6885e6c1b8b3fa474e4.zip | |
Merge branch 'master' into 3leaf
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.housekeeping | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index 1f054d537..ee652b0a5 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -39,6 +39,14 @@ version : @$(TOUCH) $@ VERYCLEANUP += .toolcheck +# Check for correct syntax for echo -e +# +ifeq ($(shell echo '\0101'),A) +ECHO_E = echo +else +ECHO_E = echo -e +endif + # Build verbosity # ifeq ($(V),1) @@ -121,7 +129,7 @@ define obj_template @$(CPP) $(CFLAGS) $(CFLAGS_$(3)) $(CFLAGS_$(4)) -DOBJECT=$(4) \ -Wno-error -M $(1) -MT "$(4)_DEPS" -MG -MP | \ sed 's/_DEPS\s*:/_DEPS =/' >> $(2) - @echo -e '\n$$(BIN)/$(4).o : $(1) $$(MAKEDEPS) $$($(4)_DEPS)' \ + @$(ECHO_E) '\n$$(BIN)/$(4).o : $(1) $$(MAKEDEPS) $$($(4)_DEPS)' \ '\n\t$$(QM)echo " [BUILD] $$@"\n' \ '\n\t$$(RULE_$(3))\n' \ '\nBOBJS += $$(BIN)/$(4).o\n' \ @@ -368,7 +376,7 @@ define media_template @$(MKDIR) -p $(dir $(2)) @$(RM) $(2) @$(TOUCH) $(2) - @echo -e '$$(BIN)/%$(1) : $$(BIN)/%$(1).zbin' \ + @$(ECHO_E) '$$(BIN)/%$(1) : $$(BIN)/%$(1).zbin' \ '\n\t$$(QM)echo " [FINISH] $$@"' \ '\n\t$$(Q)$$(CP) $$< $$@' \ '\n\t$$(Q)$$(FINALISE_$(1))' \ |