[svn-commits] kpfleming: branch group/new_loader_completion r40548 - /team/group/new_loader...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sat Aug 19 16:23:28 2006
New Revision: 40548

URL: http://svn.digium.com/view/asterisk?rev=40548&view=rev
Log:
restore optimization setting

Modified:
    team/group/new_loader_completion/Makefile
    team/group/new_loader_completion/Makefile.rules

Modified: team/group/new_loader_completion/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile?rev=40548&r1=40547&r2=40548&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile (original)
+++ team/group/new_loader_completion/Makefile Sat Aug 19 16:23:28 2006
@@ -211,7 +211,7 @@
 
 MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
 OTHER_SUBDIRS:=utils agi
-SUBDIRS_ALL:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
 SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
@@ -284,7 +284,7 @@
 	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest makeopts makeopts.embed_rules depend $(SUBDIRS_ALL) asterisk
+all: cleantest makeopts makeopts.embed_rules depend $(SUBDIRS) asterisk
 
 makeopts:
 	@echo "****"
@@ -695,4 +695,4 @@
 	@echo "Generating input for menuselect ..."
 	@build_tools/prep_moduledeps > $@
 
-.PHONY: menuselect sounds clean clean-depend dist-clean distclean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS_ALL) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+.PHONY: menuselect sounds clean clean-depend dist-clean distclean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)

Modified: team/group/new_loader_completion/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile.rules?rev=40548&r1=40547&r2=40548&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile.rules (original)
+++ team/group/new_loader_completion/Makefile.rules Sat Aug 19 16:23:28 2006
@@ -23,6 +23,17 @@
 else
    ECHO_PREFIX=@\# 
    CMD_PREFIX=
+endif
+
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)))
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions.  This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.  
+#K6OPT=-DK6OPT
+
+OPTIMIZE?=-O6
+CFLAGS+=$(OPTIMIZE)
 endif
 
 define ast_make_o_c