[asterisk-commits] kpfleming: trunk r48555 - in /trunk: ./ codecs/gsm/ codecs/ilbc/ codecs/lpc10...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Mon Dec 18 05:59:48 2006
New Revision: 48555

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48555
Log:
Merged revisions 48554 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48554 | kpfleming | 2006-12-18 05:59:24 -0600 (Mon, 18 Dec 2006) | 3 lines

remove some now-unnecessary explicit includes of autoconfig.h
clean up per-file dependencies during 'make clean'

........

Modified:
    trunk/   (props changed)
    trunk/codecs/gsm/Makefile
    trunk/codecs/ilbc/Makefile
    trunk/codecs/lpc10/Makefile
    trunk/main/Makefile
    trunk/utils/ael_main.c
    trunk/utils/astman.c
    trunk/utils/smsq.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/gsm/Makefile?view=diff&rev=48555&r1=48554&r2=48555
==============================================================================
--- trunk/codecs/gsm/Makefile (original)
+++ trunk/codecs/gsm/Makefile Mon Dec 18 05:59:48 2006
@@ -477,6 +477,7 @@
 			$(TOAST) $(TCAT) $(UNTOAST)	\
 			$(ROOT)/gsm-1.0.tar.Z
 		rm -rf lib
+		rm -f .*.d
 
 # Two tools that helped me generate gsm_encode.c and gsm_decode.c,
 # but aren't generally needed to port this.

Modified: trunk/codecs/ilbc/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/ilbc/Makefile?view=diff&rev=48555&r1=48554&r2=48555
==============================================================================
--- trunk/codecs/ilbc/Makefile (original)
+++ trunk/codecs/ilbc/Makefile Mon Dec 18 05:59:48 2006
@@ -17,4 +17,4 @@
 	$(CMD_PREFIX) $(RANLIB) $@
 
 clean:
-	rm -f $(LIB) *.o
+	rm -f $(LIB) *.o .*.d

Modified: trunk/codecs/lpc10/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/lpc10/Makefile?view=diff&rev=48555&r1=48554&r2=48555
==============================================================================
--- trunk/codecs/lpc10/Makefile (original)
+++ trunk/codecs/lpc10/Makefile Mon Dec 18 05:59:48 2006
@@ -74,4 +74,4 @@
 	$(CMD_PREFIX) $(RANLIB) $@
 
 clean:
-	rm -f *.o $(LIB)
+	rm -f *.o $(LIB) .*.d

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=48555&r1=48554&r2=48555
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Mon Dec 18 05:59:48 2006
@@ -140,6 +140,7 @@
 
 clean::
 	rm -f asterisk
+	rm -f db1-ast/.*.d
 	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
 	@$(MAKE) -C db1-ast clean
 	@$(MAKE) -C stdtime clean

Modified: trunk/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/ael_main.c?view=diff&rev=48555&r1=48554&r2=48555
==============================================================================
--- trunk/utils/ael_main.c (original)
+++ trunk/utils/ael_main.c Mon Dec 18 05:59:48 2006
@@ -1,5 +1,3 @@
-#include "asterisk/autoconfig.h"
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/utils/astman.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/astman.c?view=diff&rev=48555&r1=48554&r2=48555
==============================================================================
--- trunk/utils/astman.c (original)
+++ trunk/utils/astman.c Mon Dec 18 05:59:48 2006
@@ -22,8 +22,6 @@
  *
  */
  
-#include "asterisk/autoconfig.h"
-
 #include <newt.h>
 #include <stdio.h>
 #include <sys/time.h>

Modified: trunk/utils/smsq.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/smsq.c?view=diff&rev=48555&r1=48554&r2=48555
==============================================================================
--- trunk/utils/smsq.c (original)
+++ trunk/utils/smsq.c Mon Dec 18 05:59:48 2006
@@ -16,8 +16,6 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
-
-#include "asterisk/autoconfig.h"
 
 #include <stdio.h>
 #include <popt.h>