[svn-commits] kpfleming: branch group/new_loader_completion r40594 - in /team/group/new_loa...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Sat Aug 19 20:13:34 MST 2006 

Author: kpfleming
Date: Sat Aug 19 22:13:34 2006
New Revision: 40594

URL: http://svn.digium.com/view/asterisk?rev=40594&view=rev
Log:
restore conditional checking i should not have removed...

Modified:
    team/group/new_loader_completion/apps/Makefile
    team/group/new_loader_completion/cdr/Makefile
    team/group/new_loader_completion/channels/Makefile
    team/group/new_loader_completion/codecs/Makefile
    team/group/new_loader_completion/formats/Makefile
    team/group/new_loader_completion/funcs/Makefile
    team/group/new_loader_completion/main/Makefile
    team/group/new_loader_completion/pbx/Makefile
    team/group/new_loader_completion/res/Makefile
    team/group/new_loader_completion/sounds/Makefile

Modified: team/group/new_loader_completion/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/Makefile (original)
+++ team/group/new_loader_completion/apps/Makefile Sat Aug 19 22:13:34 2006
@@ -9,8 +9,10 @@
 # the GNU General Public License
 #
 
-include ../menuselect.makeopts
-include ../menuselect.makedeps
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include ../menuselect.makeopts
+  include ../menuselect.makedeps
+endif
 
 C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc)))

Modified: team/group/new_loader_completion/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/cdr/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/cdr/Makefile (original)
+++ team/group/new_loader_completion/cdr/Makefile Sat Aug 19 22:13:34 2006
@@ -9,8 +9,10 @@
 # the GNU General Public License
 #
 
-include ../menuselect.makeopts
-include ../menuselect.makedeps
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include ../menuselect.makeopts
+  include ../menuselect.makedeps
+endif
 
 C_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.cc,%,$(wildcard cdr_*.cc)))

Modified: team/group/new_loader_completion/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/Makefile (original)
+++ team/group/new_loader_completion/channels/Makefile Sat Aug 19 22:13:34 2006
@@ -9,8 +9,10 @@
 # the GNU General Public License
 #
 
-include ../menuselect.makeopts
-include ../menuselect.makedeps
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include ../menuselect.makeopts
+  include ../menuselect.makedeps
+endif
 
 C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.cc,%,$(wildcard chan_*.cc)))

Modified: team/group/new_loader_completion/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/Makefile (original)
+++ team/group/new_loader_completion/codecs/Makefile Sat Aug 19 22:13:34 2006
@@ -11,8 +11,10 @@
 # the GNU General Public License
 #
 
-include ../menuselect.makeopts
-include ../menuselect.makedeps
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include ../menuselect.makeopts
+  include ../menuselect.makedeps
+endif
 
 C_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.cc,%,$(wildcard codec_*.cc)))

Modified: team/group/new_loader_completion/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/formats/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/formats/Makefile (original)
+++ team/group/new_loader_completion/formats/Makefile Sat Aug 19 22:13:34 2006
@@ -9,8 +9,10 @@
 # the GNU General Public License
 #
 
-include ../menuselect.makeopts
-include ../menuselect.makedeps
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include ../menuselect.makeopts
+  include ../menuselect.makedeps
+endif
 
 C_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.cc,%,$(wildcard format_*.cc)))

Modified: team/group/new_loader_completion/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/funcs/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/funcs/Makefile (original)
+++ team/group/new_loader_completion/funcs/Makefile Sat Aug 19 22:13:34 2006
@@ -9,8 +9,10 @@
 # the GNU General Public License
 #
 
-include ../menuselect.makeopts
-include ../menuselect.makedeps
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include ../menuselect.makeopts
+  include ../menuselect.makedeps
+endif
 
 C_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.cc,%,$(wildcard func_*.cc)))

Modified: team/group/new_loader_completion/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/main/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/main/Makefile (original)
+++ team/group/new_loader_completion/main/Makefile Sat Aug 19 22:13:34 2006
@@ -11,10 +11,13 @@
 # the GNU General Public License
 #
 
-include $(ASTTOPDIR)/menuselect.makeopts
-include $(ASTTOPDIR)/menuselect.makedeps
+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
+  include $(ASTTOPDIR)/makeopts.embed_rules
 endif
 
 all: asterisk

Modified: team/group/new_loader_completion/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/pbx/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/pbx/Makefile (original)
+++ team/group/new_loader_completion/pbx/Makefile Sat Aug 19 22:13:34 2006
@@ -9,8 +9,10 @@
 # the GNU General Public License
 #
 
-include ../menuselect.makeopts
-include ../menuselect.makedeps
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include ../menuselect.makeopts
+  include ../menuselect.makedeps
+endif
 
 C_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.cc,%,$(wildcard pbx_*.cc)))

Modified: team/group/new_loader_completion/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/res/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/res/Makefile (original)
+++ team/group/new_loader_completion/res/Makefile Sat Aug 19 22:13:34 2006
@@ -9,8 +9,10 @@
 # the GNU General Public License
 #
 
-include ../menuselect.makeopts
-include ../menuselect.makedeps
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include ../menuselect.makeopts
+  include ../menuselect.makedeps
+endif
 
 C_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))
 CC_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.cc,%,$(wildcard res_*.cc)))

Modified: team/group/new_loader_completion/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/sounds/Makefile?rev=40594&r1=40593&r2=40594&view=diff
==============================================================================
--- team/group/new_loader_completion/sounds/Makefile (original)
+++ team/group/new_loader_completion/sounds/Makefile Sat Aug 19 22:13:34 2006
@@ -13,7 +13,9 @@
 
 .PHONY: dist-clean all uninstall
 
-include ../menuselect.makeopts
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
+  include $(ASTTOPDIR)/menuselect.makeopts
+endif
 
 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds

More information about the svn-commits mailing list