automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@57976 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/Makefile b/channels/Makefile
index 3a02cf3bd508c217832943e30e66d1cf9919f81a..1e09688cdf0b31d6c7adcfd825e842b97834e5e6 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -16,6 +16,8 @@
 
 CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
 
+SUBDIRS=misdn h323
+
 ifneq (${OSARCH},CYGWIN)
 # if you really, really want to use these drivers, uncomment the line below
 #CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
@@ -159,6 +161,7 @@ endif
 all: depend $(CHANNEL_LIBS) 
 
 clean:
+       for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
        rm -f *.so *.o .depend
        rm -f busy.h ringtone.h gentone gentone-ulaw