Author: anthm Date: Tue Mar 13 12:19:39 2007 New Revision: 4581 Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: build update 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 Tue Mar 13 12:19:39 2007 @@ -2,16 +2,32 @@ # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: # and define these variables to impact your build -LOCAL_CFLAGS=-I$(BASE)/libs/curl/include -LOCAL_LDFLAGS=-lshout -lmp3lame $(BASE)/libs/curl/lib/libcurl.la -LOCAL_OBJS= -include $(BASE)/build/modmake.rules +LAME=lame-3.97 +SHOUT=libshout-2.2.2 +LAMELA=$(BASE)/libs/$(LAME)/libmp3lame/libmp3lame.la +SHOUTLA=$(BASE)/libs/$(SHOUT)/src/libshout.la +CURLLA=$(BASE)/libs/curl/lib/libcurl.la +LOCAL_CFLAGS=-I$(BASE)/libs/curl/include -I$(BASE)/libs/$(SHOUT)/include -I$(BASE)/libs/$(LAME)/include +LOCAL_LDFLAGS=$(LAMELA) $(SHOUTLA) $(CURLLA) MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o +LOCAL_OBJS=$(MP3OBJS) +DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic -%.o: %.c - $(CC) $(ALL_CFLAGS) -c -o $@ $< +include $(BASE)/build/modmake.rules -local_depend: $(MP3OBJS) - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install lame-3.97.tar.gz --prefix=$(PREFIX) --disable-shared --with-pic - MOD_CFLAGS="${ALL_CFLAGS}" MOD_LDFLAGS="${LD_CFLAGS}" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libshout-2.2.2.tar.gz --disable-shared --with-pic --prefix=$(PREFIX) +$(LAMELA): + MAKE="$(MAKE)" $(BASE)/build/buildlib.sh $(BASE) $(LAME).tar.gz $(DEFAULT_ARGS) --disable-decoder + +$(SHOUTLA): + MAKE="$(MAKE)" MOD_CFLAGS="${ALL_CFLAGS}" MOD_LDFLAGS="${LD_CFLAGS}" $(BASE)/build/buildlib.sh $(BASE) $(SHOUT).tar.gz $(DEFAULT_ARGS) + +$(CURLLA): cd $(BASE)/libs/curl && $(MAKE) + +%.o: %.c + $(CC) $(ALL_CFLAGS) -c -o $@ $< + +local_depend: $(LAMELA) $(SHOUTLA) $(MP3OBJS) + + + Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Tue Mar 13 12:19:39 2007 @@ -34,7 +34,7 @@ #include "mpglib.h" #include <switch.h> #include <shout/shout.h> -#include <lame/lame.h> +#include <lame.h> #include <curl/curl.h>