diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
| commit | 0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch) | |
| tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /cdr/Makefile | |
| parent | f60ada0be22cd646454278e102d384a5dbaf7d59 (diff) | |
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cdr/Makefile')
| -rw-r--r-- | cdr/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cdr/Makefile b/cdr/Makefile index 49fc0e3d5..08dc25a2d 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # -ifneq ($(wildcard ../menuselect.makeopts),) +ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),) include ../menuselect.makeopts include ../menuselect.makedeps endif @@ -17,7 +17,12 @@ endif C_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c))) CC_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.cc,%,$(wildcard cdr_*.cc))) -SELECTED_MODS:=$(C_MODS) $(CC_MODS) +LOADABLE_MODS:=$(C_MODS) $(CC_MODS) + +ifneq ($(findstring cdr,$(MENUSELECT_EMBED)),) + EMBEDDED_MODS:=$(LOADABLE_MODS) + LOADABLE_MODS:= +endif all: _all |