[Freeswitch-svn] [commit] r3739 - freeswitch/trunk

[Freeswitch SVN]

Author: mikej
Date: Tue Dec 19 17:04:16 2006
New Revision: 3739

Modified:
   freeswitch/trunk/Makefile.am
   freeswitch/trunk/Makefile.in

Log:
move unix build to use in tree core libs

Modified: freeswitch/trunk/Makefile.am
==============================================================================
--- freeswitch/trunk/Makefile.am	(original)
+++ freeswitch/trunk/Makefile.am	Tue Dec 19 17:04:16 2006
@@ -1,5 +1,3 @@
-
-
 EXTRA_DIST =
 SUBDIRS = 
 AUTOMAKE_OPTS = gnu foreign
@@ -115,7 +113,7 @@
 lib_LTLIBRARIES		= libfreeswitch.la
 libfreeswitch_la_CFLAGS	= $(AM_CFLAGS)
 libfreeswitch_la_LDFLAGS	= -version-info 1:0:0
-libfreeswitch_la_LIBADD  = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre
+libfreeswitch_la_LIBADD  = -lteletone -lresample -lsrtp -lsqlite3 -lpcre
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
 
 bin_PROGRAMS =	freeswitch
@@ -149,14 +147,14 @@
 	@./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX)
 	@./build/addenv.sh build/freeswitch.env MAKE $(MAKE)
 	mkdir -p $(PREFIX)
-	./build/buildlib.sh . install sqlite-3.3.6.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
-	./build/buildlib.sh . install apr-1.2.7.tar.gz --prefix=$(PREFIX)
-	./build/buildlib.sh . install apr-util-1.2.7.tar.gz --with-apr=../apr-1.2.7 --prefix=$(PREFIX)
+	./build/buildlib.sh . install sqlite --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
+	./build/buildlib.sh . install apr --prefix=$(PREFIX)
+	./build/buildlib.sh . install apr-util --with-apr=../apr --prefix=$(PREFIX)
 	./build/buildlib.sh . install libresample --prefix=$(PREFIX)
 	./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
 	./build/buildlib.sh . install srtp --prefix=$(PREFIX)
-	./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
-	./build/buildlib.sh . install pcre-6.7.tar.gz --prefix=$(PREFIX)
+#	./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
+	./build/buildlib.sh . install pcre --prefix=$(PREFIX)
 	rm build/freeswitch.env
 
 

Modified: freeswitch/trunk/Makefile.in
==============================================================================
--- freeswitch/trunk/Makefile.in	(original)
+++ freeswitch/trunk/Makefile.in	Tue Dec 19 17:04:16 2006
@@ -350,7 +350,7 @@
 lib_LTLIBRARIES = libfreeswitch.la
 libfreeswitch_la_CFLAGS = $(AM_CFLAGS)
 libfreeswitch_la_LDFLAGS = -version-info 1:0:0
-libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre
+libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lpcre
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
 bin_SCRIPTS = scripts/fsxs
 freeswitch_SOURCES = src/switch.c\
@@ -1086,14 +1086,14 @@
 	@./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX)
 	@./build/addenv.sh build/freeswitch.env MAKE $(MAKE)
 	mkdir -p $(PREFIX)
-	./build/buildlib.sh . install sqlite-3.3.6.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
-	./build/buildlib.sh . install apr-1.2.7.tar.gz --prefix=$(PREFIX)
-	./build/buildlib.sh . install apr-util-1.2.7.tar.gz --with-apr=../apr-1.2.7 --prefix=$(PREFIX)
+	./build/buildlib.sh . install sqlite --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
+	./build/buildlib.sh . install apr --prefix=$(PREFIX)
+	./build/buildlib.sh . install apr-util --with-apr=../apr --prefix=$(PREFIX)
 	./build/buildlib.sh . install libresample --prefix=$(PREFIX)
 	./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
 	./build/buildlib.sh . install srtp --prefix=$(PREFIX)
-	./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
-	./build/buildlib.sh . install pcre-6.7.tar.gz --prefix=$(PREFIX)
+#	./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
+	./build/buildlib.sh . install pcre --prefix=$(PREFIX)
 	rm build/freeswitch.env
 
 modules: $(NAME)