Skip to content

F
freeswitch
提交 a642381f authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

unix retool 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@255 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 111a0f6d
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 343 行增加 和 259 行删除
Makefile.am
浏览文件 @ a642381f
......@@ -3,13 +3,14 @@ SUBDIRS =
AUTOMAKE_OPTS = gnu
MAKE=gmake
NAME=freeswitch
PREFIX=$(prefix)/${NAME}
PREFIX=$(prefix)
APR_CONFIG=$(prefix)/bin/apr-1-config
APU_CONFIG=$(prefix)/bin/apu-1-config
AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes)
AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs )
AM_CFLAGS += $(shell $(APU_CONFIG) --includes)
AM_LDFLAGS += $(shell $(APU_CONFIG) --link-ld --libs ) -lsqlite3
AM_LDFLAGS += -lresample -lm
OSARCH=$(shell uname -s)
if ISLINUX
AM_LDFLAGS += -Wl,-E
......@@ -57,7 +58,8 @@ src/switch_core.c \
src/switch_loadable_module.c \
src/switch_mutex.c \
src/switch_utils.c \
src/switch_event.c
src/switch_event.c \
src/switch_resample.c
#bindir = $(PREFIX)/bin
......@@ -76,7 +78,8 @@ library_include_HEADERS = src/include/switch.h \
src/include/switch_utils.h \
src/include/switch_caller.h \
src/include/switch_buffer.h \
src/include/switch_event.h
src/include/switch_event.h \
src/include/switch_resample.h
lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g
......@@ -96,14 +99,18 @@ nodepends: .nodepends
yesdepends:
rm .nodepends
depends:
./buildlib.sh . install sqlite-3.2.8.tar.gz --disable-tcl --enable-threadsafe
./buildlib.sh . install apr-1.2.2.tar.gz
./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2
./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
./buildlib.sh . install libresample-0.1.3.tgz --prefix=$(PREFIX)
cp libs/libresample-0.1.3/*.a $(PREFIX)/lib
cp libs/libresample-0.1.3/include/* $(PREFIX)/include
modules: $(NAME)
@echo making modules
@cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
@cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
modclean:
@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
......@@ -112,7 +119,7 @@ modclean:
install_mod: modules
@echo Installing $(NAME)
@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db
@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/bin
@/bin/cp -p ./$(NAME) $(PREFIX)/bin
@ln -sf $(PREFIX)/bin/$(NAME) /usr/bin
@echo Installing Modules
......
Makefile.in
浏览文件 @ a642381f
......@@ -77,7 +77,8 @@ am_libfreeswitch_la_OBJECTS = libfreeswitch_la-switch_buffer.lo \
libfreeswitch_la-switch_loadable_module.lo \
libfreeswitch_la-switch_mutex.lo \
libfreeswitch_la-switch_utils.lo \
libfreeswitch_la-switch_event.lo
libfreeswitch_la-switch_event.lo \
libfreeswitch_la-switch_resample.lo
libfreeswitch_la_OBJECTS = $(am_libfreeswitch_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
......@@ -224,7 +225,7 @@ SUBDIRS =
AUTOMAKE_OPTS = gnu
MAKE = gmake
NAME = freeswitch
PREFIX = $(prefix)/${NAME}
PREFIX = $(prefix)
APR_CONFIG = $(prefix)/bin/apr-1-config
APU_CONFIG = $(prefix)/bin/apu-1-config
......@@ -237,7 +238,8 @@ AM_CFLAGS = $(shell $(APR_CONFIG) --cflags --cppflags --includes) \
-DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" \
-DSWITCH_DB_DIR=\"$(PREFIX)/db\"
AM_LDFLAGS = $(shell $(APR_CONFIG) --link-ld --libs ) $(shell \
$(APU_CONFIG) --link-ld --libs ) -lsqlite3 $(am__append_1)
$(APU_CONFIG) --link-ld --libs ) -lsqlite3 -lresample -lm \
$(am__append_1)
OSARCH = $(shell uname -s)
@ISMAC_FALSE@SOLINK = -shared -Xlinker -x
@ISMAC_TRUE@SOLINK = -dynamic -bundle -undefined suppress -force_flat_namespace
......@@ -265,7 +267,8 @@ src/switch_core.c \
src/switch_loadable_module.c \
src/switch_mutex.c \
src/switch_utils.c \
src/switch_event.c
src/switch_event.c \
src/switch_resample.c
#bindir = $(PREFIX)/bin
......@@ -284,7 +287,8 @@ library_include_HEADERS = src/include/switch.h \
src/include/switch_utils.h \
src/include/switch_caller.h \
src/include/switch_buffer.h \
src/include/switch_event.h
src/include/switch_event.h \
src/include/switch_resample.h
lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g
......@@ -423,6 +427,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_event.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_loadable_module.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_mutex.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_resample.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfreeswitch_la-switch_utils.Plo@am__quote@
.c.o:
......@@ -516,6 +521,13 @@ libfreeswitch_la-switch_event.lo: src/switch_event.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_event.lo `test -f 'src/switch_event.c' || echo '$(srcdir)/'`src/switch_event.c
libfreeswitch_la-switch_resample.lo: src/switch_resample.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -MT libfreeswitch_la-switch_resample.lo -MD -MP -MF "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo" -c -o libfreeswitch_la-switch_resample.lo `test -f 'src/switch_resample.c' || echo '$(srcdir)/'`src/switch_resample.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo" "$(DEPDIR)/libfreeswitch_la-switch_resample.Plo"; else rm -f "$(DEPDIR)/libfreeswitch_la-switch_resample.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/switch_resample.c' object='libfreeswitch_la-switch_resample.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfreeswitch_la_CFLAGS) $(CFLAGS) -c -o libfreeswitch_la-switch_resample.lo `test -f 'src/switch_resample.c' || echo '$(srcdir)/'`src/switch_resample.c
freeswitch-switch.o: src/switch.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(freeswitch_CFLAGS) $(CFLAGS) -MT freeswitch-switch.o -MD -MP -MF "$(DEPDIR)/freeswitch-switch.Tpo" -c -o freeswitch-switch.o `test -f 'src/switch.c' || echo '$(srcdir)/'`src/switch.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/freeswitch-switch.Tpo" "$(DEPDIR)/freeswitch-switch.Po"; else rm -f "$(DEPDIR)/freeswitch-switch.Tpo"; exit 1; fi
......@@ -952,26 +964,32 @@ yesdepends:
rm .nodepends
depends:
./buildlib.sh . install sqlite-3.2.8.tar.gz --disable-tcl --enable-threadsafe
./buildlib.sh . install apr-1.2.2.tar.gz
./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2
./buildlib.sh . install sqlite-3.2.8.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
./buildlib.sh . install apr-1.2.2.tar.gz --prefix=$(PREFIX)
./buildlib.sh . install apr-util-1.2.2.tar.gz --with-apr=../apr-1.2.2 --prefix=$(PREFIX)
./buildlib.sh . install libresample-0.1.3.tgz --prefix=$(PREFIX)
cp libs/libresample-0.1.3/*.a $(PREFIX)/lib
cp libs/libresample-0.1.3/include/* $(PREFIX)/include
modules: $(NAME)
@echo making modules
@cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
@cd src/mod && for i in $(shell cat modules.conf | grep -v \#) ; do echo making $$i ; PREFIX="$(PREFIX)" BASE="$(PWD)" OSARCH="$(OSARCH)" SOLINK="$(SOLINK)" LDFLAGS="$(AM_LDFLAGS) -lfreeswitch" CFLAGS="$(AM_CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i || exit 1; done
modclean:
@cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CC="$(CC)" MOD="$$i" $(PWD)/modmake.sh $(PWD) $$i clean || exit 1; done
install_mod: modules
@echo Installing $(NAME)
@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db
@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/bin
@/bin/cp -p ./$(NAME) $(PREFIX)/bin
@ln -sf $(PREFIX)/bin/$(NAME) /usr/bin
@echo Installing Modules
@/bin/cp -f src/mod/*/mod_*.so $(PREFIX)/mod >/dev/null 2<&1 || echo No modules to copy.
@echo done
dox:
doxygen $(PWD)/docs/Doxygen.conf
eclean: clean
rm -f `find . -type f -name \*~`
rm -f `find . -type f -name \.*~`
......
aclocal.m4
浏览文件 @ a642381f
差异被折叠。
buildlib.sh
浏览文件 @ a642381f
......@@ -53,7 +53,7 @@ fi
cd $uncompressed
make clean 2>&1
sh ./configure --prefix=/usr/local $@
sh ./configure $@
if [ $? == 0 ] ; then
make
......
configure
浏览文件 @ a642381f
差异被折叠。
configure.in
浏览文件 @ a642381f
......@@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE(libfreeswitch,0.1)
AC_CONFIG_SRCDIR([src/switch.c])
AC_CONFIG_HEADER([src/include/config.h])
AC_PREFIX_DEFAULT(/usr/local/freeswitch)
# Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
......
src/include/switch_resample.h
浏览文件 @ a642381f
......@@ -39,6 +39,7 @@
#ifdef __cplusplus
extern "C" {
#endif
#include <stdlib.h>
struct switch_audio_resampler {
void *resampler;
......
src/mod/mod_exosip/Makefile
浏览文件 @ a642381f
......@@ -10,11 +10,11 @@ endif
all: depends $(MOD).so
depends:
$(BASE)/buildlib.sh $(BASE) install jthread-1.1.2.tar.gz
$(BASE)/buildlib.sh $(BASE) install jrtplib-3.3.0.tar.gz
$(BASE)/buildlib.sh $(BASE) install jrtp4c
$(BASE)/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz
$(BASE)/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua
$(BASE)/buildlib.sh $(BASE) install jthread-1.1.2.tar.gz --prefix=$(PREFIX)
$(BASE)/buildlib.sh $(BASE) install jrtplib-3.3.0.tar.gz --prefix=$(PREFIX)
$(BASE)/buildlib.sh $(BASE) install jrtp4c --prefix=$(PREFIX)
$(BASE)/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX)
$(BASE)/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX)
$(MOD).so: $(MOD).c
......
src/mod/mod_iaxchan/Makefile
浏览文件 @ a642381f
......@@ -3,7 +3,7 @@ LDFLAGS += -liax -L/usr/local/lib
all: depends $(MOD).so
depends:
$(BASE)/buildlib.sh $(BASE) install iax --enable-newjb
$(BASE)/buildlib.sh $(BASE) install iax --enable-newjb --prefix=$(PREFIX)
$(MOD).so: $(MOD).c
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
......
src/mod/mod_portaudio/Makefile
浏览文件 @ a642381f
......@@ -4,7 +4,7 @@ MYOBJS = pablio.o ringbuffer.o
all: depends $(MOD).so
depends:
$(BASE)/buildlib.sh $(BASE) install portaudio.tar.gz
$(BASE)/buildlib.sh $(BASE) install portaudio.tar.gz --prefix=$(PREFIX)
%.o: %.c
$(CC) -fPIC $(CFLAGS) -c -o $@ $<
......
src/mod/mod_sndfile/Makefile
浏览文件 @ a642381f
......@@ -3,7 +3,7 @@ LDFLAGS += -lsndfile -L/usr/local/lib
all: depends $(MOD).so
depends:
$(BASE)/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz
$(BASE)/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX)
$(MOD).so: $(MOD).c
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
......
src/mod/mod_speexcodec/Makefile
浏览文件 @ a642381f
all: depends $(MOD).so
depends:
$(BASE)/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz
$(BASE)/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX)
$(MOD).so: $(MOD).c
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
......
src/mod/mod_xmpp_event/Makefile
浏览文件 @ a642381f
......@@ -3,7 +3,7 @@ LDFLAGS += -liksemel -L/usr/local/lib
all: depends $(MOD).so
depends:
$(BASE)/buildlib.sh $(BASE) install iksemel-1.2.tar.gz
$(BASE)/buildlib.sh $(BASE) install iksemel-1.2.tar.gz --prefix=$(PREFIX)
$(MOD).so: $(MOD).c
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
......
src/switch_resample.c
浏览文件 @ a642381f
......@@ -113,7 +113,7 @@ SWITCH_DECLARE(size_t) switch_float_to_short(float *f, short *s, size_t len)
} else {
s[i] = (short)(ft-0.5);
}
if (s[i] > (short)MAXSAMPLE) s[i] = (short)MAXSAMPLE;
if ((float)s[i] > MAXSAMPLE) s[i] = (short)MAXSAMPLE;
if (s[i] < (short)-MAXSAMPLE) s[i] = (short)-MAXSAMPLE;
}
return len;
......@@ -188,4 +188,4 @@ SWITCH_DECLARE(void) switch_swap_linear(int16_t *buf, int len)
for (i = 0; i < len; i++) {
buf[i] = ((buf[i] >> 8) & 0x00ff) | ((buf[i] << 8) & 0xff00);
}
}
\ No newline at end of file
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论