build update

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

diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile
index eef3d6a7a7cd06a37f9b4bcae4edcaa803b772c5..0aacda471a18854af577a9a872a9a9adf1e84d3b 100644 (file)
--- a/src/mod/formats/mod_shout/Makefile
+++ b/src/mod/formats/mod_shout/Makefile
@@ -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)
+
+
+

diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c
index 943799fb076f74af0e09aaf5916b8e729d5e330a..64e9c468c7abcf6a17aa9354ea493bf489f6e472 100644 (file)
--- a/src/mod/formats/mod_shout/mod_shout.c
+++ b/src/mod/formats/mod_shout/mod_shout.c
@@ -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>