[svn-commits] branch oej/securertp-trunk r35507 - in /team/oej/securertp-trunk: ./ agi/ app...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Thu Jun 22 08:48:30 MST 2006


Author: oej
Date: Thu Jun 22 10:48:29 2006
New Revision: 35507

URL: http://svn.digium.com/view/asterisk?rev=35507&view=rev
Log:
Reset automerge, resolve conflict caused by someone in "configure" of all places ;-)

Modified:
    team/oej/securertp-trunk/   (props changed)
    team/oej/securertp-trunk/Makefile
    team/oej/securertp-trunk/agi/Makefile
    team/oej/securertp-trunk/apps/Makefile
    team/oej/securertp-trunk/build_tools/Makefile
    team/oej/securertp-trunk/cdr/Makefile
    team/oej/securertp-trunk/channels/Makefile
    team/oej/securertp-trunk/codecs/Makefile
    team/oej/securertp-trunk/configure
    team/oej/securertp-trunk/formats/Makefile
    team/oej/securertp-trunk/funcs/Makefile
    team/oej/securertp-trunk/manager.c
    team/oej/securertp-trunk/pbx/Makefile
    team/oej/securertp-trunk/res/Makefile
    team/oej/securertp-trunk/sounds/Makefile
    team/oej/securertp-trunk/utils/Makefile

Propchange: team/oej/securertp-trunk/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/securertp-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 22 10:48:29 2006
@@ -1,1 +1,1 @@
-/trunk:1-35381
+/trunk:1-35503

Modified: team/oej/securertp-trunk/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/Makefile (original)
+++ team/oej/securertp-trunk/Makefile Thu Jun 22 10:48:29 2006
@@ -12,8 +12,6 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-
-.PHONY: sounds
 
 # Create OPTIONS variable
 OPTIONS=
@@ -133,8 +131,7 @@
 MOD_SUBDIR_CFLAGS=-I../include -I..
 OTHER_SUBDIR_CFLAGS=-I../include -I..
 
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-  ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
+ifeq ($(or $(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,
@@ -143,12 +140,6 @@
 
 # Tell gcc to optimize the code
 OPTIMIZE+=-O6
-  else
-    # Stack backtraces, while useful for debugging, are incompatible with optimizations
-    ifeq ($(OSARCH),Linux)
-      CFLAGS+=-DSTACK_BACKTRACES
-    endif
-  endif
 else
   # Stack backtraces, while useful for debugging, are incompatible with optimizations
   ifeq ($(OSARCH),Linux)
@@ -208,7 +199,9 @@
 endif
 
 ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ifneq ($(OPTIMIZE),)
 ASTCFLAGS+=$(OPTIMIZE)
+endif
 
 ifeq ($(AST_DEVMODE),yes)
   ASTCFLAGS+=-Werror -Wunused
@@ -269,9 +262,16 @@
 
 ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
 
-MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
-OTHER_SUBDIRS=utils agi
+MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
+OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
+SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
+SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
+MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
+OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
+SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
+SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
 
 OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
 	translate.o file.o pbx.o cli.o md5.o term.o \
@@ -368,7 +368,13 @@
 	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest config.status menuselect.makeopts depend asterisk subdirs
+all: cleantest config.status menuselect.makeopts depend asterisk $(SUBDIRS)
+
+$(MOD_SUBDIRS):
+	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
+
+$(OTHER_SUBDIRS):
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
 
 config.status: configure
 	@CFLAGS="" ./configure
@@ -480,32 +486,31 @@
 muted: muted.o
 	$(CC) $(AUDIO_LIBS) -o muted muted.o
 
-subdirs: 
-	@for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x || exit 1 ; done
-	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C utils
-	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C agi
-
-clean-depend:
-	@for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
-	rm -f .depend .tags-depend
-
-clean: clean-depend
-	@for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
+$(SUBDIRS_CLEAN_DEPEND):
+	@$(MAKE) -C $(@:-clean-depend=) clean-depend
+
+$(SUBDIRS_CLEAN):
+	@$(MAKE) -C $(@:-clean=) clean
+
+clean-depend: $(SUBDIRS_CLEAN_DEPEND)
+
+clean: $(SUBDIRS_CLEAN) clean-depend
 	rm -f *.o *.so asterisk
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
 	rm -f include/asterisk/version.h
 	rm -f .tags-sources tags TAGS
+	rm -f .depend .tags-depend
 	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
-	$(MAKE) -C db1-ast clean
-	$(MAKE) -C stdtime clean
+	@$(MAKE) -C db1-ast clean
+	@$(MAKE) -C stdtime clean
 
 distclean: dist-clean
 
 dist-clean: clean
-	$(MAKE) -C mxml clean
-	$(MAKE) -C build_tools dist-clean
-	$(MAKE) -C sounds dist-clean
+	@$(MAKE) -C mxml clean
+	@$(MAKE) -C build_tools dist-clean
+	@$(MAKE) -C sounds dist-clean
 	rm -f menuselect.makeopts makeopts makeopts.xml
 	rm -f config.log config.status
 	rm -f include/autoconfig.h
@@ -559,7 +564,7 @@
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
 	if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
 	if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
-	ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
+	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
 	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
@@ -586,8 +591,8 @@
 	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 
-install-subdirs:
-	@for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
+$(SUBDIRS_INSTALL):
+	@$(MAKE) -C $(@:-install=) install
 
 NEWMODS=$(notdir $(wildcard */*.so))
 OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -610,7 +615,7 @@
 		echo " WARNING WARNING WARNING" ;\
 	fi
 
-install: all datafiles bininstall install-subdirs
+install: all datafiles bininstall $(SUBDIRS_INSTALL)
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -643,26 +648,26 @@
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.adsi; do \
 		if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
 		fi ; \
 	done
 
 samples: adsi
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.sample; do \
-		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
+		if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
 			if [ "$(OVERWRITE)" = "y" ]; then \
-				if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
+				if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
 					echo "Config file $$x is unchanged"; \
 					continue; \
 				fi ; \
-				mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
+				mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
 			else \
 				echo "Skipping config file $$x"; \
 				continue; \
 			fi ;\
 		fi ; \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
 	done
 	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
 		( \
@@ -772,29 +777,33 @@
 
 valgrind: dont-optimize
 
-depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h 
-	@for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x depend || exit 1 ; done
-	@for x in $(OTHER_SUBDIRS); do CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x depend || exit 1 ; done
+$(MOD_SUBDIRS_DEPEND):
+	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
+
+$(OTHER_SUBDIRS_DEPEND):
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $(@:-depend=) depend
+
+depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h $(SUBDIRS_DEPEND)
 
 .depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h
 	build_tools/mkdep $(CFLAGS) $(wildcard *.c)
 
 .tags-depend:
 	@echo -n ".tags-depend: " > $@
-	@find . -maxdepth 1 -name \*.c -printf "\t%p \\\\\n" >> $@
-	@find . -maxdepth 1 -name \*.h -printf "\t%p \\\\\n" >> $@
-	@find $(SUBDIRS) -name \*.c -printf "\t%p \\\\\n" >> $@
-	@find $(SUBDIRS) -name \*.h -printf "\t%p \\\\\n" >> $@
-	@find include -name \*.h -printf "\t%p \\\\\n" >> $@
+	@$(FIND) . -maxdepth 1 -name \*.c -printf "\t%p \\\\\n" >> $@
+	@$(FIND) . -maxdepth 1 -name \*.h -printf "\t%p \\\\\n" >> $@
+	@$(FIND) $(SUBDIRS) -name \*.c -printf "\t%p \\\\\n" >> $@
+	@$(FIND) $(SUBDIRS) -name \*.h -printf "\t%p \\\\\n" >> $@
+	@$(FIND) include -name \*.h -printf "\t%p \\\\\n" >> $@
 	@echo >> $@
 
 .tags-sources:
 	@rm -f $@
-	@find . -maxdepth 1 -name \*.c -print >> $@
-	@find . -maxdepth 1 -name \*.h -print >> $@
-	@find $(SUBDIRS) -name \*.c -print >> $@
-	@find $(SUBDIRS) -name \*.h -print >> $@
-	@find include -name \*.h -print >> $@
+	@$(FIND) . -maxdepth 1 -name \*.c -print >> $@
+	@$(FIND) . -maxdepth 1 -name \*.h -print >> $@
+	@$(FIND) $(SUBDIRS) -name \*.c -print >> $@
+	@$(FIND) $(SUBDIRS) -name \*.h -print >> $@
+	@$(FIND) include -name \*.h -print >> $@
 
 tags: .tags-depend .tags-sources
 	ctags -L .tags-sources -o $@
@@ -805,8 +814,6 @@
 	etags -o $@ `cat .tags-sources`
 
 etags: TAGS
-
-FORCE:
 
 %_env:
 	$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
@@ -827,7 +834,10 @@
 		$(MAKE) defaults.h;\
 	fi
 
-_uninstall:
+$(SUBDIRS_UNINSTALL):
+	@$(MAKE) -C $(@:-uninstall=) uninstall
+
+_uninstall: $(SUBDIRS_UNINSTALL)
 	rm -f $(DESTDIR)$(MODULES_DIR)/*
 	rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
 	rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
@@ -835,7 +845,6 @@
 	rm -rf $(DESTDIR)$(ASTHEADERDIR)
 	rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
 	rm -rf $(DESTDIR)$(ASTMANDIR)/man8
-	for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
 	$(MAKE) -C sounds uninstall
 
 uninstall: _uninstall
@@ -873,3 +882,5 @@
 makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
 	@echo "Generating list of available modules ..."
 	@build_tools/prep_moduledeps > $@
+
+.PHONY: sounds clean clean-depend dist-clean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize valgrind $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL)

Modified: team/oej/securertp-trunk/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/agi/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/agi/Makefile (original)
+++ team/oej/securertp-trunk/agi/Makefile Thu Jun 22 10:48:29 2006
@@ -11,6 +11,8 @@
 # the GNU General Public License
 #
 
+.PHONY: clean clean-depend all depend uninstall
+
 AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
 
 LIBS=
@@ -18,7 +20,7 @@
   LIBS=-lsocket -lnsl ../strcompat.o
 endif
 
-all: depend $(AGIS)
+all: $(AGIS)
 
 install: all
 	mkdir -p $(DESTDIR)$(AGI_DIR)

Modified: team/oej/securertp-trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/apps/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/apps/Makefile (original)
+++ team/oej/securertp-trunk/apps/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/build_tools/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/build_tools/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/build_tools/Makefile (original)
+++ team/oej/securertp-trunk/build_tools/Makefile Thu Jun 22 10:48:29 2006
@@ -1,3 +1,18 @@
+#
+# Asterisk -- A telephony toolkit for Linux.
+# 
+# Makefile for Build Tools
+#
+# Copyright (C) 2005-2006, Digium, Inc.
+#
+# Russell Bryant <russell at digium.com>
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License
+#
+
+.PHONY: clean dist-clean
+
 MENUSELECT_OBJS=menuselect.o menuselect_curses.o
 MENUSELECT_CFLAGS=-g -c -D_GNU_SOURCE -DMENUSELECT -I../ -I../include/
 MENUSELECT_LIBS=../mxml/libmxml.a

Modified: team/oej/securertp-trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/cdr/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/cdr/Makefile (original)
+++ team/oej/securertp-trunk/cdr/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/channels/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/channels/Makefile (original)
+++ team/oej/securertp-trunk/channels/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/codecs/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/codecs/Makefile (original)
+++ team/oej/securertp-trunk/codecs/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/configure
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/configure?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/configure (original)
+++ team/oej/securertp-trunk/configure Thu Jun 22 10:48:29 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 34062 .
+# From configure.ac Revision: 35391 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59d.
 #

Modified: team/oej/securertp-trunk/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/formats/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/formats/Makefile (original)
+++ team/oej/securertp-trunk/formats/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/funcs/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/funcs/Makefile (original)
+++ team/oej/securertp-trunk/funcs/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/manager.c
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/manager.c?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/manager.c (original)
+++ team/oej/securertp-trunk/manager.c Thu Jun 22 10:48:29 2006
@@ -169,7 +169,7 @@
 static struct manager_action *first_action = NULL;
 AST_MUTEX_DEFINE_STATIC(actionlock);
 
-/*! authority_to_str: Convert authority code to string with serveral options */
+/*! \brief Convert authority code to string with serveral options */
 static char *authority_to_str(int authority, char *res, int reslen)
 {
 	int running_total = 0, i;
@@ -418,8 +418,8 @@
 	return RESULT_SUCCESS;
 }
 
-/*! \brief  handle_showmancmds: CLI command */
-/* Should change to "manager show commands" */
+/*! \brief  CLI command 
+	Should change to "manager show commands" */
 static int handle_showmancmds(int fd, int argc, char *argv[])
 {
 	struct manager_action *cur = first_action;
@@ -438,7 +438,7 @@
 	return RESULT_SUCCESS;
 }
 
-/*! \brief  handle_showmanconn: CLI command show manager connected */
+/*! \brief CLI command show manager connected */
 /* Should change to "manager show connected" */
 static int handle_showmanconn(int fd, int argc, char *argv[])
 {
@@ -457,7 +457,7 @@
 	return RESULT_SUCCESS;
 }
 
-/*! \brief  handle_showmanconn: CLI command show manager connected */
+/*! \brief CLI command show manager connected */
 /* Should change to "manager show connected" */
 static int handle_showmaneventq(int fd, int argc, char *argv[])
 {
@@ -613,7 +613,7 @@
 	return head;
 }
 
-/*! NOTE:
+/*! \note NOTE:
    Callers of astman_send_error(), astman_send_response() or astman_send_ack() must EITHER
    hold the session lock _or_ be running in an action callback (in which case s->busy will
    be non-zero). In either of these cases, there is no need to lock-protect the session's
@@ -730,11 +730,10 @@
 	return ret;
 }
 
-/*! 
+/*! \brief
    Rather than braindead on,off this now can also accept a specific int mask value 
    or a ',' delim list of mask strings (the same as manager.conf) -anthm
 */
-
 static int set_eventmask(struct mansession *s, char *eventmask)
 {
 	int maskint = ast_strings_to_mask(eventmask);
@@ -847,7 +846,7 @@
 	return -1;
 }
 
-/*! \brief PING: Manager PING */
+/*! \brief Manager PING */
 static char mandescr_ping[] = 
 "Description: A 'Ping' action will ellicit a 'Pong' response.  Used to keep the\n"
 "  manager connection open.\n"
@@ -859,7 +858,7 @@
 	return 0;
 }
 
-/*! \brief WAITEVENT: Manager WAITEVENT */
+/*! \brief Manager WAITEVENT */
 static char mandescr_waitevent[] = 
 "Description: A 'WaitEvent' action will ellicit a 'Success' response.  Whenever\n"
 "a manager event is queued.  Once WaitEvent has been called on an HTTP manager\n"
@@ -1123,7 +1122,7 @@
 }
 
 
-/*! \brief  action_status: Manager "status" command to show channels */
+/*! \brief Manager "status" command to show channels */
 /* Needs documentation... */
 static int action_status(struct mansession *s, struct message *m)
 {
@@ -1465,7 +1464,7 @@
 	return 0;
 }
 
-/*! 	\brief Help text for manager command mailboxstatus
+/*! \brief Help text for manager command mailboxstatus
  */
 static char mandescr_mailboxstatus[] = 
 "Description: Checks a voicemail account for status.\n"
@@ -2442,9 +2441,8 @@
 		httptimeout = newhttptimeout;
 
 	/* If not enabled, do nothing */
-	if (!enabled) {
-		return 0;
-	}
+	if (!enabled)
+		return 0;
 
 	if (asock < 0) {
 		asock = socket(AF_INET, SOCK_STREAM, 0);

Modified: team/oej/securertp-trunk/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/pbx/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/pbx/Makefile (original)
+++ team/oej/securertp-trunk/pbx/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/res/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/res/Makefile (original)
+++ team/oej/securertp-trunk/res/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/sounds/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/sounds/Makefile (original)
+++ team/oej/securertp-trunk/sounds/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: dist-clean all
 
 ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makeopts

Modified: team/oej/securertp-trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/securertp-trunk/utils/Makefile?rev=35507&r1=35506&r2=35507&view=diff
==============================================================================
--- team/oej/securertp-trunk/utils/Makefile (original)
+++ team/oej/securertp-trunk/utils/Makefile Thu Jun 22 10:48:29 2006
@@ -10,6 +10,8 @@
 # This program is free software, distributed under the terms of
 # the GNU General Public License
 #
+
+.PHONY: clean clean-depend all depend uninstall
 
 UTILS:=astman smsq stereorize streamplayer aelparse
 
@@ -30,7 +32,7 @@
   UTILS:=$(filter-out aelparse,$(UTILS))
 endif
 
-all: depend $(UTILS)
+all: $(UTILS)
 
 install:
 	for x in $(UTILS); do \



More information about the svn-commits mailing list