diff options
| author | Lauri Leukkunen <lle@rahina.org> | 2006-11-02 23:47:51 +0200 |
|---|---|---|
| committer | Lauri Leukkunen <lleukkun@leka.rahina.org> | 2006-11-02 23:47:51 +0200 |
| commit | aa00067449d64cb34daf5ce968425519d49db22a (patch) | |
| tree | bdb7e1f119d990bf273cd5f9a451befb7ac802a4 | |
| parent | 929cf781829620009f417d2d35cc3ef1baece8bb (diff) | |
* llbuild update
| -rw-r--r-- | llbuild/Makefile.include | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/llbuild/Makefile.include b/llbuild/Makefile.include index 02115e8..effb768 100644 --- a/llbuild/Makefile.include +++ b/llbuild/Makefile.include @@ -31,11 +31,10 @@ LLBUILD ?= $(TOPDIR)/llbuild built_in_target := built-in.o -all_objects := $(subdirs) -all_objects += $(obj-builtin) +all_objects := $(obj-builtin) all_objects += $(foreach t,$(extra_targets),$($(t))) -filter_subdirs := $(shell for d in $(all_objects) ; do if [ -d $$d ]; then echo $$d; fi; done) +filter_subdirs := $(shell for d in $(subdirs) $(all_objects) ; do if [ -d $$d ]; then echo $$d; fi; done) filter_objects := $(shell for f in $(all_objects) ; do if [ -d $$f ]; then echo $$f/built-in.o; else echo $$f; fi; done) @@ -99,9 +98,9 @@ endif ifndef ll_verbose define ll_pretty_run - run_output=$$($$run_cmd 2>&1); \ + run_output="$$($$run_cmd 2>&1)"; \ if [ $$? -ne 0 ]; then \ - echo $$run_cmd; echo $(OPT_CURDIR)/$$run_output; \ + echo "$$run_cmd"; echo $(OPT_CURDIR)/"$$run_output"; \ false; \ else \ echo "[$$run_alias] [$(OPT_CURDIR)/$$run_target] $$run_sources"; \ |