[dahdi-commits] tzafrir: tools/trunk r10411 - /tools/trunk/
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Sun Jan 8 12:24:18 CST 2012
Author: tzafrir
Date: Sun Jan 8 12:24:13 2012
New Revision: 10411
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10411
Log:
Disable menuselect in dahdi-tools
* Remove targets from the Makefile
* report PBX_HDLC in makeopts
* Only build sethdlc is PBX_HDLC is 1
* Only build dahdi_tool is PBX_NEWT is 1
* fxstest and dahdi_diag are not included in the default target
For now the only way to manually disable building a certain tool
is by changing the value of BINS in Makefile.
Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Acked-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>
Modified:
tools/trunk/Makefile
tools/trunk/README
tools/trunk/configure
tools/trunk/makeopts.in
Modified: tools/trunk/Makefile
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/Makefile?view=diff&rev=10411&r1=10410&r2=10411
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Sun Jan 8 12:24:13 2012
@@ -5,19 +5,7 @@
#
#
-# If the file .dahdi.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/dahdi.makeopts will also be included but can be overridden
-# by the file in your home directory.
-
-GLOBAL_MAKEOPTS=$(wildcard /etc/dahdi.makeopts)
-USER_MAKEOPTS=$(wildcard ~/.dahdi.makeopts)
-
ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard menuselect.makeopts),)
- include menuselect.makeopts
- endif
endif
ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
@@ -111,8 +99,14 @@
UTILS += patgen pattest patlooptest hdlcstress hdlctest hdlcgen \
hdlcverify timertest dahdi_maint
-BINS:=fxotune fxstest sethdlc dahdi_cfg dahdi_diag dahdi_monitor dahdi_speed dahdi_test dahdi_scan dahdi_tool dahdi_maint
-BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
+
+BINS:=fxotune dahdi_cfg dahdi_monitor dahdi_speed dahdi_test dahdi_scan dahdi_maint
+ifeq (1,$(PBX_NEWT))
+ BINS += dahdi_tool
+endif
+ifeq (1,$(PBX_HDLC))
+ BINS += sethdlc
+endif
MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
TEST_BINS:=patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest dahdi_maint
@@ -122,10 +116,7 @@
GENERATED_DOCS := $(GROFF_HTML) README.html README.Astribank.html
-all: menuselect.makeopts
- @$(MAKE) _all
-
-_all: prereq programs
+all: prereq programs
libs: $(LTZ_SO) $(LTZ_A)
@@ -333,7 +324,6 @@
fi
clean:
- -@$(MAKE) -C menuselect clean
rm -f $(BINS) $(TEST_BINS)
rm -f *.o dahdi_cfg tzdriver sethdlc
rm -f $(LTZ_SO) $(LTZ_A) *.lo
@@ -353,8 +343,7 @@
distclean: dist-clean
dist-clean: clean
- @$(MAKE) -C menuselect dist-clean
- rm -f makeopts menuselect.makeopts menuselect-tree build_tools/menuselect-deps
+ rm -f makeopts
rm -f config.log config.status
rm -f .*.d
@@ -366,62 +355,7 @@
@echo "****"
@exit 1
-menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts
- menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
-
-menuconfig: menuselect
-
-cmenuconfig: cmenuselect
-
-gmenuconfig: gmenuselect
-
-nmenuconfig: nmenuselect
-
-menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
- @if [ -x menuselect/nmenuselect ]; then \
- $(MAKE) nmenuselect; \
- elif [ -x menuselect/cmenuselect ]; then \
- $(MAKE) cmenuselect; \
- elif [ -x menuselect/gmenuselect ]; then \
- $(MAKE) gmenuselect; \
- else \
- echo "No menuselect user interface found. Install ncurses,"; \
- echo "newt or GTK libraries to build one and re-rerun"; \
- echo "'make menuselect'."; \
- fi
-
-cmenuselect: menuselect/cmenuselect menuselect-tree
- - at menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-
-gmenuselect: menuselect/gmenuselect menuselect-tree
- - at menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-
-nmenuselect: menuselect/nmenuselect menuselect-tree
- - at menuselect/nmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || 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"
-
-menuselect/menuselect: menuselect/makeopts
- +$(MAKE_MENUSELECT) menuselect
-
-menuselect/cmenuselect: menuselect/makeopts
- +$(MAKE_MENUSELECT) cmenuselect
-
-menuselect/gmenuselect: menuselect/makeopts
- +$(MAKE_MENUSELECT) gmenuselect
-
-menuselect/nmenuselect: menuselect/makeopts
- +$(MAKE_MENUSELECT) nmenuselect
-
-menuselect/makeopts: makeopts
- +$(MAKE_MENUSELECT) makeopts
-
-menuselect-tree: dahdi.xml
- @echo "Generating input for menuselect ..."
- @build_tools/make_tree > $@
-
-.PHONY: menuselect distclean dist-clean clean all _all install programs tests devel data config update install-programs install-libs install-utils-subdirs utils-subdirs prereq
+.PHONY: distclean dist-clean clean all install programs tests devel data config update install-programs install-libs install-utils-subdirs utils-subdirs prereq
FORCE:
Modified: tools/trunk/README
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/README?view=diff&rev=10411&r1=10410&r2=10411
==============================================================================
--- tools/trunk/README (original)
+++ tools/trunk/README Sun Jan 8 12:24:13 2012
@@ -34,8 +34,6 @@
Note: If using `sudo` to build/install, you may need to add /sbin to your PATH.
----------------------------------
./configure
-# optional step: select custom configuration:
-#make menuselect
make
make install
# To install init scripts and config files:
Modified: tools/trunk/makeopts.in
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/makeopts.in?view=diff&rev=10411&r1=10410&r2=10411
==============================================================================
--- tools/trunk/makeopts.in (original)
+++ tools/trunk/makeopts.in Sun Jan 8 12:24:13 2012
@@ -38,6 +38,8 @@
USB_LIB=@USB_LIB@
USB_INCLUDE=@USB_INCLUDE@
+PBX_HDLC=@PBX_HDLC@
+
DAHDI_INCLUDE=@DAHDI_INCLUDE@
USE_SELINUX=@USE_SELINUX@
More information about the dahdi-commits
mailing list