kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

as discussed some time ago on the -dev list, create embedde object

Browse Source 
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:
Luigi Rizzo
2007-11-17 17:27:26 +00:00
parent a4f9397028
commit 560fe89e1b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.moddir_rules
View File

@@ -58,7 +58,6 @@ $(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o
$(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo $(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS))) modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
modules.link: $(addsuffix .eoo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
.PHONY: clean uninstall _all .PHONY: clean uninstall _all
@@ -84,11 +83,11 @@ endif
modules.link: modules.link:
@rm -f $@ @rm -f $@
@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.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 %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
clean:: clean::
rm -f *.so *.o *.oo *.eo *.eoo rm -f *.so *.o *.oo *.eo
rm -f .*.o.d .*.oo.d rm -f .*.o.d .*.oo.d
rm -f *.s *.i rm -f *.s *.i
rm -f modules.link rm -f modules.link

2
Makefile.rules
View File

@@ -85,7 +85,7 @@ endif
$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $< $(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
$(CMD_PREFIX) rm -f .$@.ld $(CMD_PREFIX) rm -f .$@.ld
%.eoo: %.o %.eo: %.oo
$(ECHO_PREFIX) echo " [EMBED] $< -> $@" $(ECHO_PREFIX) echo " [EMBED] $< -> $@"
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld
$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $< $(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<