[svn-commits] kpfleming: trunk r309 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Fri Sep 22 18:30:58 2006
New Revision: 309

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

........
r308 | kpfleming | 2006-09-22 18:30:22 -0500 (Fri, 22 Sep 2006) | 3 lines

remove silly sort
don't try to compute dependencies for modules we aren't going to build anyway

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Sep 22 18:30:58 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-299
+/branches/1.4:1-299,308

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-addons/trunk/Makefile?rev=309&r1=308&r2=309&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Sep 22 18:30:58 2006
@@ -49,7 +49,7 @@
 endif
 MODULES_DIR=$(ASTLIBDIR)/modules
 
-MODS:=$(sort format_mp3 app_saycountpl res_config_mysql app_addon_sql_mysql cdr_addon_mysql chan_ooh323)
+MODS:=app_addon_sql_mysql app_saycountpl cdr_addon_mysql chan_ooh323 format_mp3 res_config_mysql
 
 SELECTED_MODS:=$(patsubst %,%.so,$(filter-out $(MENUSELECT_ADDONS),$(MODS)))
 
@@ -159,7 +159,7 @@
 depend: .depend
 
 .depend:
-	build_tools/mkdep $(CFLAGS) $(wildcard *.c)
+	build_tools/mkdep $(CFLAGS) $(SELECTED_MODS:%.so=%.c)
 
 samples: 
 	mkdir -p $(DESTDIR)$(ASTETCDIR)