move unix build to use in tree core libs

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

diff --git a/Makefile.am b/Makefile.am
index 359b83e5e7e6a64c2a4b0a833b978331f25f5b8d..f11c2512b153f64faf5de5d30825596271e1049d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-
-
 EXTRA_DIST =
 SUBDIRS = 
 AUTOMAKE_OPTS = gnu foreign
@@ -115,7 +113,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs
 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 @@ depends:
        @./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
 
 

diff --git a/Makefile.in b/Makefile.in
index 5e911807a6c42b9de7525785224e2cdc1a492762..b7e9d47f9ed474a34d6d6ae66a7c2103b322b54a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -350,7 +350,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs
 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 @@ depends:
        @./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)