[svn-commits] qwell: branch 1.6.0 r234257 - in /branches/1.6.0: ./ Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Dec 10 15:02:59 2009
New Revision: 234257

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

................
  r234256 | qwell | 2009-12-10 15:01:39 -0600 (Thu, 10 Dec 2009) | 16 lines
  
  Merged revisions 234255 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r234255 | qwell | 2009-12-10 14:58:09 -0600 (Thu, 10 Dec 2009) | 9 lines
    
    Fix unselecting of menuselect options via GLOBAL_MAKEOPTS and USER_MAKEOPTS.
    
    (closes issue #16296)
    Reported by: abelbeck
    Patches:
          issue16296-20091210.diff uploaded by qwell (license 4)
    (abelbeck described a fix, which I expanded upon)
    Tested by: abelbeck, qwell, lmadsen
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile?view=diff&rev=234257&r1=234256&r2=234257
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Thu Dec 10 15:02:59 2009
@@ -357,6 +357,7 @@
 	@exit 1
 
 menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+	menuselect/menuselect --check-deps $@
 	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
 
 $(MOD_SUBDIRS_EMBED_LDSCRIPT):
@@ -856,14 +857,14 @@
 		echo "'make menuselect'."; \
 	fi
 
-cmenuselect: menuselect/cmenuselect menuselect-tree
-	- at menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
-
-gmenuselect: menuselect/gmenuselect menuselect-tree
-	- at menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
-
-nmenuselect: menuselect/nmenuselect menuselect-tree
-	- at menuselect/nmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+cmenuselect: menuselect/cmenuselect menuselect-tree menuselect.makeopts
+	- at menuselect/cmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
+gmenuselect: menuselect/gmenuselect menuselect-tree menuselect.makeopts
+	- at menuselect/gmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
+nmenuselect: menuselect/nmenuselect menuselect-tree menuselect.makeopts
+	- at menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
 # options for make in menuselect/
 MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"