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'

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48555 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 93a52153516a2473297bbf0afabe70ea863abd47..29475d8a62a7b6f402e930b8ccfc5971ee905deb 100644 (file)
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -477,6 +477,7 @@ clean:      semi-clean
                        $(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.

diff --git a/codecs/ilbc/Makefile b/codecs/ilbc/Makefile
index 3c4668ba8dd1ed1cbfd2ed3544563ee743ade56e..3864f31fbd5177602eb9883b40cfce3aba222381 100644 (file)
--- a/codecs/ilbc/Makefile
+++ b/codecs/ilbc/Makefile
@@ -17,4 +17,4 @@ $(LIB): $(OBJS)
        $(CMD_PREFIX) $(RANLIB) $@
 
 clean:
-       rm -f $(LIB) *.o
+       rm -f $(LIB) *.o .*.d

diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile
index 5594bb86bfbe4880c428701f6731e6464f8fa134..e3308913abba99cd2785115e4511534b984ec038 100644 (file)
--- a/codecs/lpc10/Makefile
+++ b/codecs/lpc10/Makefile
@@ -74,4 +74,4 @@ $(LIB): $(OBJ)
        $(CMD_PREFIX) $(RANLIB) $@
 
 clean:
-       rm -f *.o $(LIB)
+       rm -f *.o $(LIB) .*.d

diff --git a/main/Makefile b/main/Makefile
index 4d1bb086099bef5f04b5578538063d882269035b..e35df85b2a6161a980fb45b71ce2dc2a3fb5825f 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -140,6 +140,7 @@ asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 
 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

diff --git a/utils/ael_main.c b/utils/ael_main.c
index 606ac8d6a6d17dab8aa8af9669d3f787044e8a85..e589dc96712145b235ac486bbe57490dc5ae4a3e 100644 (file)
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -1,5 +1,3 @@
-#include "asterisk/autoconfig.h"
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/utils/astman.c b/utils/astman.c
index f58aa6b18db6dee4965fa814777fc71c2e1bc091..b473714971cc93b8b56a3a3963b45c8a8b7b0227 100644 (file)
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -22,8 +22,6 @@
  *
  */
  
-#include "asterisk/autoconfig.h"
-
 #include <newt.h>
 #include <stdio.h>
 #include <sys/time.h>

diff --git a/utils/smsq.c b/utils/smsq.c
index 64be3718106a45696bf5f8d371f43df24dc09bd9..bacae9ef3116afac9549ddd1913115439bf1b0d5 100644 (file)
--- a/utils/smsq.c
+++ b/utils/smsq.c
@@ -17,8 +17,6 @@
  * at the top of the source tree.
  */
 
-#include "asterisk/autoconfig.h"
-
 #include <stdio.h>
 #include <popt.h>
 #include <sys/types.h>