as discussed some time ago on the -dev list, create embedde object
with a .eo suffix even if they are coming from .cc sources. This simplifies the handling in the build scripts. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
a4f9397028
commit
560fe89e1b
|
@ -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
|
||||
|
|
|
@ -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 $@ $<
|
||||
|
|
Loading…
Reference in New Issue