diff options
| author | russell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-01 21:19:49 +0000 |
|---|---|---|
| committer | russell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-01 21:19:49 +0000 |
| commit | 335e8044bae37e33ffb8170b61486e3fcaec4f8f (patch) | |
| tree | 53c31159bbd3e829126959508f73440ab53c275e | |
| parent | a65892a9c11dcba906ecea80609a3446073d838f (diff) | |
have menuselect output which modules and utitiles *not* to build
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1199 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | makeopts.xml | 30 |
2 files changed, 12 insertions, 31 deletions
@@ -127,11 +127,11 @@ LIBTONEZONE_SO:=libtonezone.so LIBTONEZONE_SO_MAJOR_VER:=1 LIBTONEZONE_SO_MINOR_VER:=0 -ifneq ($(findstring xpp_usb,$(MENUSELECT_MODULES)),) - BUILD_XPP=yes - MENUSELECT_MODULES:=$(filter-out xpp_usb,$(MENUSELECT_MODULES)) +ifeq ($(findstring xpp_usb,$(MENUSELECT_MODULES)),) + BUILD_XPP:=yes endif -MODULES:=$(MENUSELECT_MODULES) +MODULES:=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode +MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES)) MODULESO:=$(MODULES:%=%.o) MODULESKO:=$(MODULES:%=%.ko) @@ -161,9 +161,10 @@ ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && [ "x$(BUILD obj-m+=xpp/ endif -BINS:=$(MENUSELECT_UTILS) -UTILS:=$(filter-out zttool fxstest ztcfg,$(MENUSELECT_UTILS)) +BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool +UTILS:=$(filter-out zttool fxstest ztcfg,$(BINS)) UTILSO:=$(UTILS:%=%.o) +BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS)) all: menuselect.makeopts @$(MAKE) _all diff --git a/makeopts.xml b/makeopts.xml index 8afd1be..b5ad061 100644 --- a/makeopts.xml +++ b/makeopts.xml @@ -2,85 +2,65 @@ <menu name="Zaptel Module Selection"> -<category name="MENUSELECT_MODULES" displayname="Kernel Modules" positive_output="yes"> +<category name="MENUSELECT_MODULES" displayname="Kernel Modules"> <member name="pciradio" displayname="PCI Radio" remove_on_change="pciradio.o pciradio.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="tor2" displayname="Tormenta 2" remove_on_change="tor2.o tor2.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="torisa" displayname="Tormenta ISA" remove_on_change="torisa.o torisa.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="wcfxo" displayname="Wildcard X100P" remove_on_change="wcfxo.o wcfxo.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="wct1xxp" displayname="Wildcard T100P / E100P" remove_on_change="wct1xxp.o wct1xxp.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="wct4xxp" displayname="Wildcard TE4XXP / TE2XXP" remove_on_change="wct4xxp.o wct4xxp.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="wctdm" displayname="Wildcard TDM400P" remove_on_change="wctdm.o wctdm.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="wctdm24xxp" displayname="Wildcard TDM2400P" remove_on_change="wctdm24xxp.o wctdm24xxp.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="wcte11xp" displayname="Wildcard TE110P" remove_on_change="wcte11xp.o wcte11xp.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="wcusb" displayname="Wildcard S100U" remove_on_change="wcusb.o wcusb.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="xpp_usb" displayname="Astribank"> - <defaultenabled>yes</defaultenabled> </member> <member name="zaptel" displayname="Zaptel" remove_on_change="zaptel.o zaptel.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="ztd-eth" displayname="TDMoE" remove_on_change="ztd-eth.o ztd-eth.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="ztd-loc" displayname="Local" remove_on_change="ztd-loc.o ztd-loc.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="ztdummy" displayname="Dummy Timing Interface" remove_on_change="ztdummy.o ztdummy.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="ztdynamic" displayname="Dynamic" remove_on_change="ztdynamic.o ztdynamic.ko"> - <defaultenabled>yes</defaultenabled> </member> <member name="zttranscode" displayname="Zaptel Transcoders" remove_on_change="zttranscode.o zttranscode.ko"> - <defaultenabled>yes</defaultenabled> </member> </category> -<category name="MENUSELECT_UTILS" displayname="Utilities" positive_output="yes"> +<category name="MENUSELECT_UTILS" displayname="Utilities"> <member name="fxotune" remove_on_change="fxotune fxotune.o"> - <defaultenabled>yes</defaultenabled> </member> <member name="fxstest" remove_on_change="fxstest fxstest.o"> + <defaultenabled>no</defaultenabled> </member> <member name="sethdlc-new" remove_on_change="sethdlc-new sethdlc-new.o"> + <defaultenabled>no</defaultenabled> </member> <member name="ztcfg" remove_on_change="ztcfg ztcfg.o"> - <defaultenabled>yes</defaultenabled> </member> <member name="ztdiag" remove_on_change="ztdiag ztdiag.o"> + <defaultenabled>no</defaultenabled> </member> <member name="ztmonitor" remove_on_change="ztmonitor ztmonitor.o"> - <defaultenabled>yes</defaultenabled> </member> <member name="ztspeed" remove_on_change="ztspeed ztspeed.o"> - <defaultenabled>yes</defaultenabled> </member> <member name="zttest" remove_on_change="zttest zttest.o"> - <defaultenabled>yes</defaultenabled> </member> <member name="zttool" remove_on_change="zttool zttool.o"> <depend>libnewt</depend> - <defaultenabled>yes</defaultenabled> </member> </category> |