diff options
-rwxr-xr-x | Makefile | 31 | ||||
-rwxr-xr-x | cdr/Makefile | 4 | ||||
-rwxr-xr-x | channels/h323/Makefile | 2 | ||||
-rwxr-xr-x | codecs/Makefile | 24 | ||||
-rwxr-xr-x | codecs/gsm/Makefile | 4 | ||||
-rwxr-xr-x | codecs/ilbc/LPCencode.c | 6 | ||||
-rwxr-xr-x | codecs/ilbc/helpfun.c | 2 | ||||
-rwxr-xr-x | codecs/ilbc/helpfun.h | 2 |
8 files changed, 43 insertions, 32 deletions
@@ -100,7 +100,7 @@ _all: all @echo " + cannot be run before being installed by +" @echo " + running: +" @echo " + +" - @echo " + make install +" + @echo " + $(MAKE) install +" @echo " +-------------------------------------------+" all: asterisk subdirs @@ -114,11 +114,11 @@ editline/config.h: fi editline/libedit.a: editline/config.h - make -C editline libedit.a + $(MAKE) -C editline libedit.a db1-ast/libdb1.a: @if [ -d db1-ast ]; then \ - make -C db1-ast libdb1.a ; \ + $(MAKE) -C db1-ast libdb1.a ; \ else \ echo "You need to do a cvs update -d not just cvs update"; \ exit 1; \ @@ -134,8 +134,17 @@ _version: 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: ./make_build_h +endif asterisk: .version build.h editline/libedit.a db1-ast/libdb1.a $(OBJS) gcc -o asterisk -rdynamic $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a @@ -148,8 +157,8 @@ clean: rm -f *.o *.so asterisk rm -f build.h rm -f ast_expr.c - @if [ -e editline/Makefile ]; then make -C editline clean ; fi - make -C db1-ast clean + @if [ -e editline/Makefile ]; then $(MAKE) -C editline clean ; fi + $(MAKE) -C db1-ast clean datafiles: all mkdir -p $(ASTVARLIBDIR)/sounds/digits @@ -179,7 +188,7 @@ datafiles: all update: @if [ -d CVS ]; then \ echo "Updating from CVS..." ; \ - cvs update -d; \ + cvs -q update -Pd; \ rm -f .version; \ else \ echo "Not CVS"; \ @@ -216,14 +225,14 @@ bininstall: all @echo " + configuration files (overwriting any +" @echo " + existing config files), run: +" @echo " + +" - @echo " + make samples +" + @echo " + $(MAKE) samples +" @echo " + +" @echo " +----------------- or ---------------------+" @echo " + +" @echo " + You can go ahead and install the asterisk +" @echo " + program documentation now or later run: +" @echo " + +" - @echo " + make progdocs +" + @echo " + $(MAKE) progdocs +" @echo " + +" @echo " + **Note** This requires that you have +" @echo " + doxygen installed on your local system +" @@ -305,8 +314,8 @@ rpm: __rpm __rpm: _version rm -rf /tmp/asterisk ; \ mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ - make INSTALL_PREFIX=/tmp/asterisk install ; \ - make INSTALL_PREFIX=/tmp/asterisk samples ; \ + $(MAKE) INSTALL_PREFIX=/tmp/asterisk install ; \ + $(MAKE) INSTALL_PREFIX=/tmp/asterisk samples ; \ mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \ cp -f redhat/rpmrc /tmp/asterisk/ ; \ @@ -329,6 +338,6 @@ config: dont-optimize: - make OPTIMIZE= K6OPT= install + $(MAKE) OPTIMIZE= K6OPT= install valgrind: dont-optimize diff --git a/cdr/Makefile b/cdr/Makefile index 62f5ed176..36b4dba87 100755 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -18,12 +18,14 @@ CFLAGS+= # # 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/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) MLFLAGS= 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 /opt/mysql/lib/mysql ]; then echo "-L/opt/mysql/lib/mysql"; fi) diff --git a/channels/h323/Makefile b/channels/h323/Makefile index efcc5daa8..740306dd2 100755 --- a/channels/h323/Makefile +++ b/channels/h323/Makefile @@ -43,7 +43,7 @@ install: all @echo " + configuration file (overwriting existing +" @echo " + config file), run: +" @echo " + +" - @echo " + make samples +" + @echo " + $(MAKE) samples +" @echo " + +" @echo " + +" diff --git a/codecs/Makefile b/codecs/Makefile index 00778b821..1ce2d333f 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -40,30 +40,30 @@ all: $(CODECS) clean: rm -f *.so *.o - ! [ -d g723.1 ] || make -C g723.1 clean - ! [ -d g723.1b ] || make -C g723.1b clean - make -C gsm clean - make -C mp3 clean - make -C lpc10 clean - make -C ilbc clean + ! [ -d g723.1 ] || $(MAKE) -C g723.1 clean + ! [ -d g723.1b ] || $(MAKE) -C g723.1b clean + $(MAKE) -C gsm clean + $(MAKE) -C mp3 clean + $(MAKE) -C lpc10 clean + $(MAKE) -C ilbc clean $(LIBG723): - make -C g723.1 all + $(MAKE) -C g723.1 all gsm/lib/libgsm.a: - make -C gsm lib/libgsm.a + $(MAKE) -C gsm lib/libgsm.a $(LIBG723B): - make -C g723.1b all + $(MAKE) -C g723.1b all $(LIBMP3): - make -C mp3 all + $(MAKE) -C mp3 all $(LIBLPC10): - make -C lpc10 all + $(MAKE) -C lpc10 all $(LIBILBC): - make -C ilbc all + $(MAKE) -C ilbc all codec_ilbc.so: codec_ilbc.o $(LIBILBC) $(CC) -shared -Xlinker -x -o $@ $< $(LIBILBC) diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 721879da9..01ce9c921 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -351,12 +351,12 @@ $(LIB): gsminstall: -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ - make $(GSM_INSTALL_TARGETS) ; \ + $(MAKE) $(GSM_INSTALL_TARGETS) ; \ fi toastinstall: -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \ - make $(TOAST_INSTALL_TARGETS); \ + $(MAKE) $(TOAST_INSTALL_TARGETS); \ fi gsmuninstall: diff --git a/codecs/ilbc/LPCencode.c b/codecs/ilbc/LPCencode.c index 330796d7b..251cd3fe5 100755 --- a/codecs/ilbc/LPCencode.c +++ b/codecs/ilbc/LPCencode.c @@ -41,13 +41,13 @@ void SimpleAnalysis( is = LPC_LOOKBACK; if (k < (LPC_N - 1)) { - window(temp, lpc_winTbl, lpc_buffer, BLOCKL); + lbc_window(temp, lpc_winTbl, lpc_buffer, BLOCKL); } else { - window(temp, lpc_asymwinTbl, lpc_buffer + is, BLOCKL); + lbc_window(temp, lpc_asymwinTbl, lpc_buffer + is, BLOCKL); } 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); bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1); diff --git a/codecs/ilbc/helpfun.c b/codecs/ilbc/helpfun.c index 8788e7894..936afd614 100755 --- a/codecs/ilbc/helpfun.c +++ b/codecs/ilbc/helpfun.c @@ -42,7 +42,7 @@ void autocorr( * window multiplication *---------------------------------------------------------------*/ -void window( +void lbc_window( float *z, /* (o) the windowed data */ const float *x, /* (i) the original data vector */ const float *y, /* (i) the window */ diff --git a/codecs/ilbc/helpfun.h b/codecs/ilbc/helpfun.h index be6e727b7..01edc876b 100755 --- a/codecs/ilbc/helpfun.h +++ b/codecs/ilbc/helpfun.h @@ -21,7 +21,7 @@ void autocorr( int order /* largest lag for calculated autocorrelations */ ); -void window( +void lbc_window( float *z, /* (o) the windowed data */ const float *x, /* (i) the original data vector */ const float *y, /* (i) the window */ |