diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
| commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
| tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /codecs/Makefile | |
| parent | a42edc84034f91932a3e12d503e07f76a6eb498a (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: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/Makefile')
| -rw-r--r-- | codecs/Makefile | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index f476e8a2b..9726979e0 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -11,7 +11,7 @@ # the GNU General Public License # -ifneq ($(wildcard ../menuselect.makeopts),) +ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),) include ../menuselect.makeopts include ../menuselect.makedeps endif @@ -19,22 +19,25 @@ endif C_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c))) CC_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.cc,%,$(wildcard codec_*.cc))) -SELECTED_MODS:=$(C_MODS) $(CC_MODS) +LOADABLE_MODS:=$(C_MODS) $(CC_MODS) + +ifneq ($(findstring codecs,$(MENUSELECT_EMBED)),) + EMBEDDED_MODS:=$(LOADABLE_MODS) + LOADABLE_MODS:= +endif LIBILBC:=ilbc/libilbc.a LIBLPC10:=lpc10/liblpc10.a all: _all -ifeq ($(GSM_LIB),internal) -GSM_INCLUDE:=-Igsm/inc -GSM_LIB:= +include $(ASTTOPDIR)/Makefile.moddir_rules -codec_gsm.so: gsm/lib/libgsm.a +ifneq ($(GSM_INTERNAL),) +GSM_INCLUDE:=-Igsm/inc +$(codec_gsm): gsm/lib/libgsm.a endif -include $(ASTTOPDIR)/Makefile.moddir_rules - clean:: $(MAKE) -C gsm clean $(MAKE) -C lpc10 clean @@ -42,14 +45,14 @@ clean:: gsm/lib/libgsm.a: @mkdir -p gsm/lib - @CFLAGS="$(CFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a + @CFLAGS="$(OTHER_SUBDIR_CFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a $(LIBLPC10): - @$(MAKE) -C lpc10 all + @CFLAGS="$(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C lpc10 all -codec_lpc10.so: $(LIBLPC10) +$(codec_lpc10): $(LIBLPC10) $(LIBILBC): - @$(MAKE) -C ilbc all + @CFLAGS="$(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C ilbc all -codec_ilbc.so: $(LIBILBC) +$(codec_ilbc): $(LIBILBC) |