From 1bec2f5bfae922cc163cecb43c868e8e8ee3a66d Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 22 Feb 2007 02:36:00 +0000 Subject: give embedded modules a helping hand by backing up and restoring their global variables when they are loaded and unloaded git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56092 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile.moddir_rules | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Makefile.moddir_rules') diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index c614c2ab5..d2dafe329 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -34,11 +34,13 @@ $(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC $(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB)) $(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS)) +$(EMBEDDED_MODS:%=%.o): ASTCFLAGS+=-DEMBEDDED_MODULE=$* + $(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o $(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo -modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS))) -modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS))) +modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS))) +modules.link: $(addsuffix .eoo,$(filter $(EMBEDDED_MODS),$(CC_MODS))) .PHONY: clean uninstall _all @@ -64,11 +66,11 @@ endif modules.link: @rm -f $@ - @for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done - @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done + @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 clean:: - rm -f *.so *.o *.oo + rm -f *.so *.o *.oo *.eo *.eoo rm -f .*.o.d .*.oo.d rm -f modules.link -- cgit v1.2.3