[svn-commits] branch group/menuselect r1126 - in /team/group/menuselect: Makefile makeopts.xml

[svn-commits at lists.digium.com]

Author: russell
Date: Mon Jun 19 22:22:59 2006
New Revision: 1126

URL: http://svn.digium.com/view/zaptel?rev=1126&view=rev
Log:
only build modules selected by 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=1126&r1=1125&r2=1126&view=diff
==============================================================================
--- team/group/menuselect/Makefile (original)
+++ team/group/menuselect/Makefile Mon Jun 19 22:22:59 2006
@@ -57,6 +57,19 @@
   endif
 endif
 
+# If the file .zaptel.makeopts is present in your home directory, you can
+# include all of your favorite menuselect options so that every time you download
+# a new version of Asterisk, you don't have to run menuselect to set them.
+# The file /etc/zaptel.makeopts will also be included but can be overridden
+# by the file in your home directory.
+
+GLOBAL_MAKEOPTS=$(wildcard /etc/zaptel.makeopts)
+USER_MAKEOPTS=$(wildcard ~/.zaptel.makeopts)
+
+ifneq ($(wildcard menuselect.makeopts),)
+  include menuselect.makeopts
+endif
+
 #
 # Features are now configured in zconfig.h
 #
@@ -108,14 +121,12 @@
 LIBTONEZONE_SO_MAJOR_VER:=1
 LIBTONEZONE_SO_MINOR_VER:=0
 
-MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
-	 ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
-         ztd-loc # ztdummy
-#MODULES+=wcfxsusb
-# build ztdummy by default for 2.6 kernels
-ifeq ($(BUILDVER),linux26)
-MODULES+=ztdummy
-endif
+ifneq ($(findstring xpp,$(MENUSELECT_MODULES)),)
+  BUILD_XPP=yes
+  MENUSELECT_MODULES:=$(filter-out xpp,$(MENUSELECT_MODULES))
+endif
+
+MODULES:=zaptel $(MENUSELECT_MODULES)
 
 MODULESO:=$(MODULES:%=%.o)
 MODULESKO:=$(MODULES:%=%.ko)
@@ -141,7 +152,7 @@
 # This line is only meaningful when this Makefile is used as kconfig for 
 # 2.6 build
 
-ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && echo 1))
+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
 obj-m+=xpp/
 endif
 

Modified: team/group/menuselect/makeopts.xml
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/makeopts.xml?rev=1126&r1=1125&r2=1126&view=diff
==============================================================================
--- team/group/menuselect/makeopts.xml (original)
+++ team/group/menuselect/makeopts.xml Mon Jun 19 22:22:59 2006
@@ -46,6 +46,8 @@
 	</member>
 	<member name="wcfxsusb" displayname="USB FXS">
 	</member>
+	<member name="xpp" displayname="XPP">
+	</member>
 </category>
 
 </menu>