[svn-commits] pcadach: branch pcadach/chan_h323-live r41227 - in /team/pcadach/chan_h323-li...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Sat Aug 26 22:34:24 MST 2006 

Author: pcadach
Date: Sun Aug 27 00:34:23 2006
New Revision: 41227

URL: http://svn.digium.com/view/asterisk?rev=41227&view=rev
Log:
Merged revisions 41209 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r41209 | kpfleming | 2006-08-27 05:58:47 +0600 (Вск, 27 Авг 2006) | 2 lines

GNU make already knows how to quietly ignore non-existent files in 'include' directives

........

Modified:
    team/pcadach/chan_h323-live/   (props changed)
    team/pcadach/chan_h323-live/Makefile.moddir_rules
    team/pcadach/chan_h323-live/agi/Makefile
    team/pcadach/chan_h323-live/apps/Makefile
    team/pcadach/chan_h323-live/cdr/Makefile
    team/pcadach/chan_h323-live/channels/Makefile
    team/pcadach/chan_h323-live/codecs/Makefile
    team/pcadach/chan_h323-live/formats/Makefile
    team/pcadach/chan_h323-live/funcs/Makefile
    team/pcadach/chan_h323-live/main/Makefile
    team/pcadach/chan_h323-live/pbx/Makefile
    team/pcadach/chan_h323-live/res/Makefile
    team/pcadach/chan_h323-live/sounds/Makefile
    team/pcadach/chan_h323-live/utils/Makefile

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Aug 27 00:34:23 2006
@@ -1,1 +1,1 @@
-/trunk:1-41193,41196
+/trunk:1-41226

Modified: team/pcadach/chan_h323-live/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/Makefile.moddir_rules?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/Makefile.moddir_rules (original)
+++ team/pcadach/chan_h323-live/Makefile.moddir_rules Sun Aug 27 00:34:23 2006
@@ -95,9 +95,7 @@
 
 uninstall::
 
-ifneq ($(wildcard .depend),)
- include .depend
-endif
+-include .depend
 
 depend: .depend
 

Modified: team/pcadach/chan_h323-live/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/agi/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/agi/Makefile (original)
+++ team/pcadach/chan_h323-live/agi/Makefile Sun Aug 27 00:34:23 2006
@@ -40,9 +40,7 @@
 clean: clean-depend
 	rm -f *.so *.o look eagi-test eagi-sphinx-test
 
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend
 
 depend: .depend
 

Modified: team/pcadach/chan_h323-live/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/apps/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/apps/Makefile (original)
+++ team/pcadach/chan_h323-live/apps/Makefile Sun Aug 27 00:34:23 2006
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc)))

Modified: team/pcadach/chan_h323-live/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/cdr/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/cdr/Makefile (original)
+++ team/pcadach/chan_h323-live/cdr/Makefile Sun Aug 27 00:34:23 2006
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.cc,%,$(wildcard cdr_*.cc)))

Modified: team/pcadach/chan_h323-live/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/Makefile (original)
+++ team/pcadach/chan_h323-live/channels/Makefile Sun Aug 27 00:34:23 2006
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.cc,%,$(wildcard chan_*.cc)))

Modified: team/pcadach/chan_h323-live/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/codecs/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/codecs/Makefile (original)
+++ team/pcadach/chan_h323-live/codecs/Makefile Sun Aug 27 00:34:23 2006
@@ -11,10 +11,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.cc,%,$(wildcard codec_*.cc)))

Modified: team/pcadach/chan_h323-live/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/formats/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/formats/Makefile (original)
+++ team/pcadach/chan_h323-live/formats/Makefile Sun Aug 27 00:34:23 2006
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.cc,%,$(wildcard format_*.cc)))

Modified: team/pcadach/chan_h323-live/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/funcs/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/funcs/Makefile (original)
+++ team/pcadach/chan_h323-live/funcs/Makefile Sun Aug 27 00:34:23 2006
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.cc,%,$(wildcard func_*.cc)))

Modified: team/pcadach/chan_h323-live/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/Makefile (original)
+++ team/pcadach/chan_h323-live/main/Makefile Sun Aug 27 00:34:23 2006
@@ -11,14 +11,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include $(ASTTOPDIR)/menuselect.makeopts
-  include $(ASTTOPDIR)/menuselect.makedeps
-endif
-
-ifneq ($(wildcard $(ASTTOPDIR)/makeopts.embed_rules),)
-  include $(ASTTOPDIR)/makeopts.embed_rules
-endif
+-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts.embed_rules
 
 all: asterisk
 

Modified: team/pcadach/chan_h323-live/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/pbx/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/pbx/Makefile (original)
+++ team/pcadach/chan_h323-live/pbx/Makefile Sun Aug 27 00:34:23 2006
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.cc,%,$(wildcard pbx_*.cc)))

Modified: team/pcadach/chan_h323-live/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/res/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/res/Makefile (original)
+++ team/pcadach/chan_h323-live/res/Makefile Sun Aug 27 00:34:23 2006
@@ -9,10 +9,7 @@
 # the GNU General Public License
 #
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include ../menuselect.makeopts
-  include ../menuselect.makedeps
-endif
+-include ../menuselect.makeopts ../menuselect.makedeps
 
 C_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.cc,%,$(wildcard res_*.cc)))

Modified: team/pcadach/chan_h323-live/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/sounds/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/sounds/Makefile (original)
+++ team/pcadach/chan_h323-live/sounds/Makefile Sun Aug 27 00:34:23 2006
@@ -13,9 +13,7 @@
 
 .PHONY: dist-clean all uninstall
 
-ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
-  include $(ASTTOPDIR)/menuselect.makeopts
-endif
+-include $(ASTTOPDIR)/menuselect.makeopts
 
 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds

Modified: team/pcadach/chan_h323-live/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/utils/Makefile?rev=41227&r1=41226&r2=41227&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/utils/Makefile (original)
+++ team/pcadach/chan_h323-live/utils/Makefile Sun Aug 27 00:34:23 2006
@@ -100,9 +100,7 @@
 muted: muted.o
 muted: LIBS+=$(AUDIO_LIBS)
 
-ifneq ($(wildcard .depend),)
-  include .depend
-endif
+-include .depend
 
 depend: .depend

More information about the svn-commits mailing list