[svn-commits] rizzo: trunk r89387 - in /trunk: Makefile.moddir_rules Makefile.rules

[SVN commits to the Digium repositories]

Author: rizzo
Date: Sat Nov 17 11:27:26 2007
New Revision: 89387

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89387
Log:
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.


Modified:
    trunk/Makefile.moddir_rules
    trunk/Makefile.rules

Modified: trunk/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/trunk/Makefile.moddir_rules?view=diff&rev=89387&r1=89386&r2=89387
==============================================================================
--- trunk/Makefile.moddir_rules (original)
+++ trunk/Makefile.moddir_rules Sat Nov 17 11:27:26 2007
@@ -58,7 +58,6 @@
 $(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 @@
 
 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

Modified: trunk/Makefile.rules
URL: http://svn.digium.com/view/asterisk/trunk/Makefile.rules?view=diff&rev=89387&r1=89386&r2=89387
==============================================================================
--- trunk/Makefile.rules (original)
+++ trunk/Makefile.rules Sat Nov 17 11:27:26 2007
@@ -85,7 +85,7 @@
 	$(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 $@ $<