fix makefiles

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4714 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile
index ed71dc9b79c2be49fd626b268d4aef59de6709c4..2c5335428c7fc3cebc4de0850bf40324fb7707bc 100644 (file)
--- a/src/mod/codecs/mod_g723_1/Makefile
+++ b/src/mod/codecs/mod_g723_1/Makefile
@@ -1,6 +1,8 @@
 BASE=../../../..
+DIR=$(BASE)/libs/libg723_1
+A=$(DIR)/.libs/libg723.a
 
-LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg723_1; then echo "-I$(PREFIX)/include" ; else echo "-DG723_PASSTHROUGH" ; fi ;
-LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg723_1 || echo "-L/usr/local/freeswitch/lib -lg723"
+LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG723_PASSTHROUGH" ; fi ;
+LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) 
 
 include $(BASE)/build/modmake.rules

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index f370a660ea88243db222112145edf3c38aaf74f1..c89a136d8ebcc53ef63dc54b5aa667d3b2317b6b 100644 (file)
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -1,4 +1,7 @@
 BASE=../../../..
-LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/g729; then echo "-I$(PREFIX)/include/g729" ; else echo "-DG729_PASSTHROUGH" ; fi ;
-LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/g729 || echo "-L/usr/local/freeswitchlib -lg729" 
+DIR=$(BASE)/libs/libg729
+A=$(DIR)/.libs/libg729.a
+
+LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
+LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) 
 include $(BASE)/build/modmake.rules

diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile
index 44cc1195e77a16f22b853e1f0c551ffb39ecab41..e847e58d6cbe6ce02d9820bdca4f3bbb9fed6c86 100644 (file)
--- a/src/mod/formats/mod_shout/Makefile
+++ b/src/mod/formats/mod_shout/Makefile
@@ -11,8 +11,8 @@ LAMELA=$(LAME_DIR)/libmp3lame/libmp3lame.la
 SHOUTLA=$(SHOUT_DIR)/src/libshout.la
 
 LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include
-LOCAL_LIBADD=$(LAMELA) $(SHOUTLA)
-
+LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) 
+LOCAL_LDFLAGS += -lspeex
 MP3SOURCES=common.c dct64_i386.c decode_ntom.c layer3.c tabinit.c interface.c
 MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o
 LOCAL_OBJS=$(MP3OBJS)