lame

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

diff --git a/Makefile.am b/Makefile.am
index af1f48b2eb63b5e46d7a9afce3ebdc1f0d314ca5..9b76806748a98c59ebcd12036fd02ec8a6c03331 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ SOLINK=-shared -Xlinker -x
 endif
 
 
-AM_LDFLAGS += -L$(PREFIX)/lib
+#AM_LDFLAGS += -L$(PREFIX)/lib
 
 
 AM_CFLAGS  += -fPIC -Wall

diff --git a/Makefile.in b/Makefile.in
index 089fb51db4362c80460fe4e49ce78def400b2c2f..72995e09d8c279b821e13b67c2a176fe5f408448 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -226,13 +226,14 @@ MAKE = gmake
 NAME = freeswitch
 PREFIX = $(prefix)/${NAME}
 APR_CONFIG = $(prefix)/bin/apr-1-config
+
+#AM_LDFLAGS += -L$(PREFIX)/lib
 AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \
        $(am__append_2) -fPIC -Wall -I$(PWD) -I$(PWD)/src/include \
        -I$(PREFIX)/include -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
        -DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
        -DSWITCH_CONF_DIR=\"$(PREFIX)/conf\"
-AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(am__append_1) \
-       -L$(PREFIX)/lib
+AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(am__append_1)
 OSARCH = $(shell uname -s)
 @ISMAC_FALSE@SOLINK = -shared -Xlinker -x
 @ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace

diff --git a/src/mod/mod_portaudio/Makefile b/src/mod/mod_portaudio/Makefile
index 090dfee9c1a06b22b863964f771499eeaaf9e12e..e5027a97a09f88dfdb21f75ef81b17d675b862aa 100644 (file)
--- a/src/mod/mod_portaudio/Makefile
+++ b/src/mod/mod_portaudio/Makefile
@@ -1,8 +1,11 @@
 LDFLAGS += -lportaudio -L/usr/local/lib
+MYOBJS = pablio.o ringbuffer.o
+%.o:  %.c
+       $(CC) -fPIC $(CFLAGS) -c -o $@ $<
 
-$(MOD).so: $(MOD).c
+$(MOD).so: $(MOD).c $(MYOBJS)
        $(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o 
-       $(CC) $(SOLINK) -o $(MOD).so  $(MOD).o $(LDFLAGS)
+       $(CC) $(SOLINK) -o $(MOD).so $(MOD).o $(MYOBJS) $(LDFLAGS)
 
 all:   $(MOD).so
 

diff --git a/src/mod/mod_portaudio/ringbuffer.h b/src/mod/mod_portaudio/ringbuffer.h
index 6f6569447112bb264afd17bbcd9fa7a860389e48..3cd559488bd6f11c2eac4ea16cd12ad34b1fe969 100644 (file)
--- a/src/mod/mod_portaudio/ringbuffer.h
+++ b/src/mod/mod_portaudio/ringbuffer.h
@@ -40,6 +40,7 @@ extern "C"
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
  *\r
  */\r
+#define PortAudioStream PaStream\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <math.h>\r