[asterisk-commits] kpfleming: branch group/new_loader_completion r40690 - in /team/group/new_loa...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sun Aug 20 16:31:42 2006
New Revision: 40690

URL: http://svn.digium.com/view/asterisk?rev=40690&view=rev
Log:
make the build a little quieter
remove some useless MOD_LOADER definitions
don't call load_modules twice, it is not necessary

Modified:
    team/group/new_loader_completion/Makefile
    team/group/new_loader_completion/main/asterisk.c
    team/group/new_loader_completion/main/translate.c

Modified: team/group/new_loader_completion/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile?rev=40690&r1=40689&r2=40690&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile (original)
+++ team/group/new_loader_completion/Makefile Sun Aug 20 16:31:42 2006
@@ -275,10 +275,10 @@
 main: $(filter-out main,$(MOD_SUBDIRS))
 
 $(MOD_SUBDIRS):
-	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@ all
+	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -s -C $@ SUBDIR=$@ all
 
 $(OTHER_SUBDIRS):
-	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@ SUBDIR=$@ all
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -s -C $@ SUBDIR=$@ all
 
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp
@@ -302,10 +302,10 @@
 	@rm -f $@.tmp
 
 $(SUBDIRS_CLEAN_DEPEND):
-	@$(MAKE) -C $(@:-clean-depend=) clean-depend
+	@$(MAKE) -s -C $(@:-clean-depend=) clean-depend
 
 $(SUBDIRS_CLEAN):
-	@$(MAKE) -C $(@:-clean=) clean
+	@$(MAKE) -s -C $(@:-clean=) clean
 
 clean-depend: $(SUBDIRS_CLEAN_DEPEND)
 
@@ -590,10 +590,10 @@
 dont-optimize: all
 
 $(MOD_SUBDIRS_DEPEND):
-	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
+	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -s -C $(@:-depend=) depend
 
 $(OTHER_SUBDIRS_DEPEND):
-	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -s -C $(@:-depend=) depend
 
 depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h $(SUBDIRS_DEPEND)
 
@@ -611,7 +611,7 @@
 	fi
 
 $(SUBDIRS_UNINSTALL):
-	@$(MAKE) -C $(@:-uninstall=) uninstall
+	@$(MAKE) -s -C $(@:-uninstall=) uninstall
 
 _uninstall: $(SUBDIRS_UNINSTALL)
 	rm -f $(DESTDIR)$(MODULES_DIR)/*

Modified: team/group/new_loader_completion/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/main/asterisk.c?rev=40690&r1=40689&r2=40690&view=diff
==============================================================================
--- team/group/new_loader_completion/main/asterisk.c (original)
+++ team/group/new_loader_completion/main/asterisk.c Sun Aug 20 16:31:42 2006
@@ -2602,71 +2602,70 @@
 		printf(term_quit());
 		exit(1);
 	}
+	if (load_modules()) {
+		printf(term_quit());
+		exit(1);
+	}
+
 	if (dnsmgr_init()) {
 		printf(term_quit());
 		exit(1);
 	}
-	/* load 'preload' modules, required for access to Realtime-mapped configuration files */
-	if (load_modules()) {
-		printf(term_quit());
-		exit(1);
-	}
+
 	ast_http_init();
+
 	ast_channels_init();
+
 	if (init_manager()) {
 		printf(term_quit());
 		exit(1);
 	}
+
 	if (ast_cdr_engine_init()) {
 		printf(term_quit());
 		exit(1);
 	}
+
 	if (ast_device_state_engine_init()) {
 		printf(term_quit());
 		exit(1);
 	}
+
 	ast_rtp_init();
+
 	ast_udptl_init();
+
 	if (ast_image_init()) {
 		printf(term_quit());
 		exit(1);
 	}
+
 	if (ast_file_init()) {
 		printf(term_quit());
 		exit(1);
 	}
+
 	if (load_pbx()) {
 		printf(term_quit());
 		exit(1);
 	}
-	if (load_modules()) {
-		printf(term_quit());
-		exit(1);
-	}
+
 	if (init_framer()) {
 		printf(term_quit());
 		exit(1);
 	}
+
 	if (astdb_init()) {
 		printf(term_quit());
 		exit(1);
 	}
+
 	if (ast_enum_init()) {
 		printf(term_quit());
 		exit(1);
 	}
 
 	dnsmgr_start_refresh();
-
-#if 0
-	/* This should no longer be necessary */
-	/* sync cust config and reload some internals in case a custom config handler binded to them */
-	read_ast_cust_config();
-	reload_logger(0);
-	reload_manager();
-	ast_enum_reload();
-	ast_rtp_reload();
-#endif
 
 	/* We might have the option of showing a console, but for now just
 	   do nothing... */
@@ -2676,13 +2675,17 @@
 		ast_verbose(term_color(tmp, "Asterisk Ready.\n", COLOR_BRWHITE, COLOR_BLACK, sizeof(tmp)));
 	if (ast_opt_no_fork)
 		consolethread = pthread_self();
+
 	ast_set_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED);
 	pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
+
 #ifdef __AST_DEBUG_MALLOC
 	__ast_mm_init();
 #endif	
+
 	time(&ast_startuptime);
 	ast_cli_register_multiple(core_cli, sizeof(core_cli) / sizeof(core_cli[0]));
+
 	if (ast_opt_console) {
 		/* Console stuff now... */
 		/* Register our quit function */

Modified: team/group/new_loader_completion/main/translate.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/main/translate.c?rev=40690&r1=40689&r2=40690&view=diff
==============================================================================
--- team/group/new_loader_completion/main/translate.c (original)
+++ team/group/new_loader_completion/main/translate.c Sun Aug 20 16:31:42 2006
@@ -23,7 +23,6 @@
  * \author Mark Spencer <markster at digium.com> 
  */
 
-#define MOD_LOADER	/* not really a module */
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")