kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some symbol and Makefile issues

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@886 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-04-23 16:23:12 +00:00
parent d19769f687
commit 7d1c585587
8 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@@ -100,7 +100,7 @@ _all: all
@echo " + cannot be run before being installed by +" @echo " + cannot be run before being installed by +"
@echo " + running: +" @echo " + running: +"
@echo " + +" @echo " + +"
@echo " + make install +" @echo " + $(MAKE) install +"
@echo " +-------------------------------------------+" @echo " +-------------------------------------------+"
all: asterisk subdirs all: asterisk subdirs
@@ -114,11 +114,11 @@ editline/config.h:
fi fi
editline/libedit.a: editline/config.h editline/libedit.a: editline/config.h
make -C editline libedit.a $(MAKE) -C editline libedit.a
db1-ast/libdb1.a: db1-ast/libdb1.a:
@if [ -d db1-ast ]; then \ @if [ -d db1-ast ]; then \
make -C db1-ast libdb1.a ; \ $(MAKE) -C db1-ast libdb1.a ; \
else \ else \
echo "You need to do a cvs update -d not just cvs update"; \ echo "You need to do a cvs update -d not just cvs update"; \
exit 1; \ exit 1; \
@@ -134,8 +134,17 @@ _version:
ast_expr.o: ast_expr.c ast_expr.o: ast_expr.c
cli.o: cli.c build.h
ifneq ($(strip $(ASTERISKVERSION)),)
asterisk.o: asterisk.c .version
build.h: .version
./make_build_h
else
build.h: build.h:
./make_build_h ./make_build_h
endif
asterisk: .version build.h editline/libedit.a db1-ast/libdb1.a $(OBJS) asterisk: .version build.h editline/libedit.a db1-ast/libdb1.a $(OBJS)
gcc -o asterisk -rdynamic $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a gcc -o asterisk -rdynamic $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a
@@ -148,8 +157,8 @@ clean:
rm -f *.o *.so asterisk rm -f *.o *.so asterisk
rm -f build.h rm -f build.h
rm -f ast_expr.c rm -f ast_expr.c
@if [ -e editline/Makefile ]; then make -C editline clean ; fi @if [ -e editline/Makefile ]; then $(MAKE) -C editline clean ; fi
make -C db1-ast clean $(MAKE) -C db1-ast clean
datafiles: all datafiles: all
mkdir -p $(ASTVARLIBDIR)/sounds/digits mkdir -p $(ASTVARLIBDIR)/sounds/digits
@@ -179,7 +188,7 @@ datafiles: all
update: update:
@if [ -d CVS ]; then \ @if [ -d CVS ]; then \
echo "Updating from CVS..." ; \ echo "Updating from CVS..." ; \
cvs update -d; \ cvs -q update -Pd; \
rm -f .version; \ rm -f .version; \
else \ else \
echo "Not CVS"; \ echo "Not CVS"; \
@@ -216,14 +225,14 @@ bininstall: all
@echo " + configuration files (overwriting any +" @echo " + configuration files (overwriting any +"
@echo " + existing config files), run: +" @echo " + existing config files), run: +"
@echo " + +" @echo " + +"
@echo " + make samples +" @echo " + $(MAKE) samples +"
@echo " + +" @echo " + +"
@echo " +----------------- or ---------------------+" @echo " +----------------- or ---------------------+"
@echo " + +" @echo " + +"
@echo " + You can go ahead and install the asterisk +" @echo " + You can go ahead and install the asterisk +"
@echo " + program documentation now or later run: +" @echo " + program documentation now or later run: +"
@echo " + +" @echo " + +"
@echo " + make progdocs +" @echo " + $(MAKE) progdocs +"
@echo " + +" @echo " + +"
@echo " + **Note** This requires that you have +" @echo " + **Note** This requires that you have +"
@echo " + doxygen installed on your local system +" @echo " + doxygen installed on your local system +"
@@ -305,8 +314,8 @@ rpm: __rpm
__rpm: _version __rpm: _version
rm -rf /tmp/asterisk ; \ rm -rf /tmp/asterisk ; \
mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
make INSTALL_PREFIX=/tmp/asterisk install ; \ $(MAKE) INSTALL_PREFIX=/tmp/asterisk install ; \
make INSTALL_PREFIX=/tmp/asterisk samples ; \ $(MAKE) INSTALL_PREFIX=/tmp/asterisk samples ; \
mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \ cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
cp -f redhat/rpmrc /tmp/asterisk/ ; \ cp -f redhat/rpmrc /tmp/asterisk/ ; \
@@ -329,6 +338,6 @@ config:
dont-optimize: dont-optimize:
make OPTIMIZE= K6OPT= install $(MAKE) OPTIMIZE= K6OPT= install
valgrind: dont-optimize valgrind: dont-optimize

4
cdr/Makefile
View File

@@ -18,12 +18,14 @@ CFLAGS+=
# #
# MySQL stuff... Autoconf anyone?? # MySQL stuff... Autoconf anyone??
# #
MODS+=$(shell if [ -d /usr/include/mysql ] || [ -d /usr/local/include/mysql ] || [ -d /opt/mysql/include ]; then echo "cdr_mysql.so"; fi) MODS+=$(shell if [ -d /usr/local/mysql/include ] || [ --d /usr/include/mysql ] || [ -d /usr/local/include/mysql ] || [ -d /opt/mysql/include ]; then echo "cdr_mysql.so"; fi)
CFLAGS+=$(shell if [ -d /usr/local/mysql/include ]; then echo "-I/usr/local/mysql/include"; fi)
CFLAGS+=$(shell if [ -d /usr/include/mysql ]; then echo "-I/usr/include/mysql"; fi) CFLAGS+=$(shell if [ -d /usr/include/mysql ]; then echo "-I/usr/include/mysql"; fi)
CFLAGS+=$(shell if [ -d /usr/local/include/mysql ]; then echo "-I/usr/local/include/mysql"; fi) CFLAGS+=$(shell if [ -d /usr/local/include/mysql ]; then echo "-I/usr/local/include/mysql"; fi)
CFLAGS+=$(shell if [ -d /opt/mysql/include/mysql ]; then echo "-I/opt/mysql/include/mysql"; fi) CFLAGS+=$(shell if [ -d /opt/mysql/include/mysql ]; then echo "-I/opt/mysql/include/mysql"; fi)
MLFLAGS= MLFLAGS=
MLFLAGS+=$(shell if [ -d /usr/lib/mysql ]; then echo "-L/usr/lib/mysql"; fi) MLFLAGS+=$(shell if [ -d /usr/lib/mysql ]; then echo "-L/usr/lib/mysql"; fi)
MLFLAGS+=$(shell if [ -d /usr/local/mysql/lib ]; then echo "-L/usr/local/mysql/lib"; fi)
MLFLAGS+=$(shell if [ -d /usr/local/lib/mysql ]; then echo "-L/usr/local/lib/mysql"; fi) MLFLAGS+=$(shell if [ -d /usr/local/lib/mysql ]; then echo "-L/usr/local/lib/mysql"; fi)
MLFLAGS+=$(shell if [ -d /opt/mysql/lib/mysql ]; then echo "-L/opt/mysql/lib/mysql"; fi) MLFLAGS+=$(shell if [ -d /opt/mysql/lib/mysql ]; then echo "-L/opt/mysql/lib/mysql"; fi)

2
channels/h323/Makefile
View File

@@ -43,7 +43,7 @@ install: all
@echo " + configuration file (overwriting existing +" @echo " + configuration file (overwriting existing +"
@echo " + config file), run: +" @echo " + config file), run: +"
@echo " + +" @echo " + +"
@echo " + make samples +" @echo " + $(MAKE) samples +"
@echo " + +" @echo " + +"
@echo " + +" @echo " + +"

24
codecs/Makefile
View File

@@ -40,30 +40,30 @@ all: $(CODECS)
clean: clean:
rm -f *.so *.o rm -f *.so *.o
! [ -d g723.1 ] || make -C g723.1 clean ! [ -d g723.1 ] || $(MAKE) -C g723.1 clean
! [ -d g723.1b ] || make -C g723.1b clean ! [ -d g723.1b ] || $(MAKE) -C g723.1b clean
make -C gsm clean $(MAKE) -C gsm clean
make -C mp3 clean $(MAKE) -C mp3 clean
make -C lpc10 clean $(MAKE) -C lpc10 clean
make -C ilbc clean $(MAKE) -C ilbc clean
$(LIBG723): $(LIBG723):
make -C g723.1 all $(MAKE) -C g723.1 all
gsm/lib/libgsm.a: gsm/lib/libgsm.a:
make -C gsm lib/libgsm.a $(MAKE) -C gsm lib/libgsm.a
$(LIBG723B): $(LIBG723B):
make -C g723.1b all $(MAKE) -C g723.1b all
$(LIBMP3): $(LIBMP3):
make -C mp3 all $(MAKE) -C mp3 all
$(LIBLPC10): $(LIBLPC10):
make -C lpc10 all $(MAKE) -C lpc10 all
$(LIBILBC): $(LIBILBC):
make -C ilbc all $(MAKE) -C ilbc all
codec_ilbc.so: codec_ilbc.o $(LIBILBC) codec_ilbc.so: codec_ilbc.o $(LIBILBC)
$(CC) -shared -Xlinker -x -o $@ $< $(LIBILBC) $(CC) -shared -Xlinker -x -o $@ $< $(LIBILBC)

4
codecs/gsm/Makefile
View File

@@ -351,12 +351,12 @@ $(LIB):
gsminstall: gsminstall:
-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
make $(GSM_INSTALL_TARGETS) ; \ $(MAKE) $(GSM_INSTALL_TARGETS) ; \
fi fi
toastinstall: toastinstall:
-if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \ -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \
make $(TOAST_INSTALL_TARGETS); \ $(MAKE) $(TOAST_INSTALL_TARGETS); \
fi fi
gsmuninstall: gsmuninstall:

6
codecs/ilbc/LPCencode.c
View File

@@ -41,13 +41,13 @@ void SimpleAnalysis(
is = LPC_LOOKBACK; is = LPC_LOOKBACK;
if (k < (LPC_N - 1)) { if (k < (LPC_N - 1)) {
window(temp, lpc_winTbl, lpc_buffer, BLOCKL); lbc_window(temp, lpc_winTbl, lpc_buffer, BLOCKL);
} else { } else {
window(temp, lpc_asymwinTbl, lpc_buffer + is, BLOCKL); lbc_window(temp, lpc_asymwinTbl, lpc_buffer + is, BLOCKL);
} }
autocorr(r, temp, BLOCKL, LPC_FILTERORDER); autocorr(r, temp, BLOCKL, LPC_FILTERORDER);
window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1); lbc_window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
levdurb(lp, temp, r, LPC_FILTERORDER); levdurb(lp, temp, r, LPC_FILTERORDER);
bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1); bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1);

2
codecs/ilbc/helpfun.c
View File

@@ -42,7 +42,7 @@ void autocorr(
* window multiplication * window multiplication
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
void window( void lbc_window(
float *z, /* (o) the windowed data */ float *z, /* (o) the windowed data */
const float *x, /* (i) the original data vector */ const float *x, /* (i) the original data vector */
const float *y, /* (i) the window */ const float *y, /* (i) the window */

2
codecs/ilbc/helpfun.h
View File

@@ -21,7 +21,7 @@ void autocorr(
int order /* largest lag for calculated autocorrelations */ int order /* largest lag for calculated autocorrelations */
); );
void window( void lbc_window(
float *z, /* (o) the windowed data */ float *z, /* (o) the windowed data */
const float *x, /* (i) the original data vector */ const float *x, /* (i) the original data vector */
const float *y, /* (i) the window */ const float *y, /* (i) the window */