diff options
| -rw-r--r-- | Makefile.moddir_rules | 7 | ||||
| -rw-r--r-- | Makefile.rules | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index acc222894..17924be56 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -58,7 +58,6 @@ $(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o $(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS))) -modules.link: $(addsuffix .eoo,$(filter $(EMBEDDED_MODS),$(CC_MODS))) .PHONY: clean uninstall _all @@ -84,11 +83,11 @@ endif modules.link: @rm -f $@ - @for file in $(patsubst %,$(SUBDIR)/%,$(filter %.eo %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done - @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done + @for file in $(patsubst %,$(SUBDIR)/%,$(filter %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done + @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done clean:: - rm -f *.so *.o *.oo *.eo *.eoo + rm -f *.so *.o *.oo *.eo rm -f .*.o.d .*.oo.d rm -f *.s *.i rm -f modules.link diff --git a/Makefile.rules b/Makefile.rules index 2851d2f9f..ca21dcc04 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -85,7 +85,7 @@ endif $(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $< $(CMD_PREFIX) rm -f .$@.ld -%.eoo: %.o +%.eo: %.oo $(ECHO_PREFIX) echo " [EMBED] $< -> $@" $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld $(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $< |