From 645e48cb82a3f075129d395648571857b2d5989f Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Wed, 14 Dec 2005 18:11:49 +0000
Subject: [PATCH] lame

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@150 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 Makefile.am                        | 2 +-
 Makefile.in                        | 5 +++--
 src/mod/mod_portaudio/Makefile     | 7 +++++--
 src/mod/mod_portaudio/ringbuffer.h | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index af1f48b2eb..9b76806748 100644
--- 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 089fb51db4..72995e09d8 100644
--- 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 090dfee9c1..e5027a97a0 100644
--- 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 6f65694471..3cd559488b 100644
--- 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.
  *
  */
+#define PortAudioStream PaStream
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>