Fix some symbol and Makefile issues

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@886 f38db490-d61c-443f-a65b-d21fe96a405b

5 files changed, 19 insertions, 19 deletions

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 */