[zaptel-commits] branch group/menuselect r1127 - in /team/group/menuselect: Makefile makeopts.xml

[zaptel-commits at lists.digium.com]

Author: russell
Date: Mon Jun 19 22:55:53 2006
New Revision: 1127

URL: http://svn.digium.com/view/zaptel?rev=1127&view=rev
Log:
support selecting utilities in menuselect

Modified:
    team/group/menuselect/Makefile
    team/group/menuselect/makeopts.xml

Modified: team/group/menuselect/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/Makefile?rev=1127&r1=1126&r2=1127&view=diff
==============================================================================
--- team/group/menuselect/Makefile (original)
+++ team/group/menuselect/Makefile Mon Jun 19 22:55:53 2006
@@ -126,7 +126,7 @@
   MENUSELECT_MODULES:=$(filter-out xpp,$(MENUSELECT_MODULES))
 endif
 
-MODULES:=zaptel $(MENUSELECT_MODULES)
+MODULES:=$(MENUSELECT_MODULES)
 
 MODULESO:=$(MODULES:%=%.o)
 MODULESKO:=$(MODULES:%=%.ko)
@@ -159,9 +159,8 @@
 ifneq (,$(wildcard /usr/include/newt.h))
 ZTTOOL:=zttool
 endif
-BINS:=ztcfg ztmonitor ztspeed $(ZTTOOL) zttest fxotune
-UTILS:=tor2ee ztspeed zttool ztmonitor sethdlc-new \
-  usbfxstest fxstest fxotune fxsdump ztdiag
+BINS:=$(MENUSELECT_UTILS)
+UTILS:=$(filter-out ztcfg,$(MENUSELECT_UTILS))
 UTILSO:=$(UTILS:%=%.o)
 
 all: modules $(LIBTONEZONE_SO)

Modified: team/group/menuselect/makeopts.xml
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/makeopts.xml?rev=1127&r1=1126&r2=1127&view=diff
==============================================================================
--- team/group/menuselect/makeopts.xml (original)
+++ team/group/menuselect/makeopts.xml Mon Jun 19 22:55:53 2006
@@ -3,16 +3,24 @@
 <menu>
 
 <category name="MENUSELECT_MODULES" displayname="Kernel Modules" positive_output="yes">
+	<member name="pciradio" displayname="PCI Radio">
+		<defaultenabled>yes</defaultenabled>
+	</member>
 	<member name="tor2" displayname="Tormenta 2">
 		<defaultenabled>yes</defaultenabled>
 	</member>
 	<member name="torisa" displayname="Tormenta ISA">
 		<defaultenabled>yes</defaultenabled>
 	</member>
-	<member name="wcusb" displayname="Wildcard S100U">
+	<member name="wcfxo" displayname="Wildcard X100P">
 		<defaultenabled>yes</defaultenabled>
 	</member>
-	<member name="wcfxo" displayname="Wildcard X100P">
+	<member name="wcfxsusb" displayname="USB FXS">
+	</member>
+	<member name="wct1xxp" displayname="Wildcard T100P / E100P">
+		<defaultenabled>yes</defaultenabled>
+	</member>
+	<member name="wct4xxp" displayname="Wildcard TE4XXP / TE2XXP">
 		<defaultenabled>yes</defaultenabled>
 	</member>
 	<member name="wctdm" displayname="Wildcard TDM400P">
@@ -21,22 +29,18 @@
 	<member name="wctdm24xxp" displayname="Wildcard TDM2400P">
 		<defaultenabled>yes</defaultenabled>
 	</member>
-	<member name="ztdynamic" displayname="Dynamic">
+	<member name="wcte11xp" displayname="Wildcard TE110P">
+		<defaultenabled>yes</defaultenabled>
+	</member>
+	<member name="wcusb" displayname="Wildcard S100U">
+		<defaultenabled>yes</defaultenabled>
+	</member>
+	<member name="xpp" displayname="XPP">
+	</member>
+	<member name="zaptel" displayname="Zaptel">
 		<defaultenabled>yes</defaultenabled>
 	</member>
 	<member name="ztd-eth" displayname="TDMoE">
-		<defaultenabled>yes</defaultenabled>
-	</member>
-	<member name="wct1xxp" displayname="Wildcard T100P / E100P">
-		<defaultenabled>yes</defaultenabled>
-	</member>
-	<member name="wct4xxp" displayname="Wildcard TE4XXP / TE2XXP">
-		<defaultenabled>yes</defaultenabled>
-	</member>
-	<member name="wcte11xp" displayname="Wildcard TE110P">
-		<defaultenabled>yes</defaultenabled>
-	</member>
-	<member name="pciradio" displayname="PCI Radio">
 		<defaultenabled>yes</defaultenabled>
 	</member>
 	<member name="ztd-loc" displayname="Local">
@@ -44,9 +48,42 @@
 	</member>
 	<member name="ztdummy" displayname="Dummy Timing Interface">
 	</member>
-	<member name="wcfxsusb" displayname="USB FXS">
+	<member name="ztdynamic" displayname="Dynamic">
+		<defaultenabled>yes</defaultenabled>
 	</member>
-	<member name="xpp" displayname="XPP">
+</category>
+
+<category name="MENUSELECT_UTILS" displayname="Utilities" positive_output="yes">
+	<member name="fxotune">
+		<defaultenabled>yes</defaultenabled>
+	</member>
+	<member name="fxsdump">
+	</member>
+	<member name="fxstest">
+	</member>
+	<member name="sethdlc-new">
+	</member>
+	<member name="tor2ee">
+	</member>
+	<member name="usbfxstest">
+	</member>
+	<member name="ztcfg">
+		<defaultenabled>yes</defaultenabled>
+	</member>
+	<member name="ztdiag">
+	</member>
+	<member name="ztmonitor">
+		<defaultenabled>yes</defaultenabled>
+	</member>
+	<member name="ztspeed">
+		<defaultenabled>yes</defaultenabled>
+	</member>
+	<member name="zttest">
+		<defaultenabled>yes</defaultenabled>
+	</member>
+	<member name="zttool">
+		<depend>newt</depend>
+		<defaultenabled>yes</defaultenabled>
 	</member>
 </category>