From 560fe89e1ba41cb1aced1733885fb7112851a808 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Sat, 17 Nov 2007 17:27:26 +0000 Subject: 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 --- Makefile.moddir_rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefile.moddir_rules') 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 -- cgit v1.2.3