Author: anthm Date: Wed Mar 21 13:04:22 2007 New Revision: 4714 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/trunk/src/mod/formats/mod_shout/Makefile Log: fix makefiles Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Wed Mar 21 13:04:22 2007 @@ -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 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Wed Mar 21 13:04:22 2007 @@ -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 Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Wed Mar 21 13:04:22 2007 @@ -11,8 +11,8 @@ 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)