[svn-commits] russell: branch 1.4 r3528 - in /branches/1.4: Makefile makeopts.in

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Dec 19 13:34:39 2007
New Revision: 3528

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3528
Log:
There is an architectural issue with the way menuselect works in zaptel.  If
the menuselect.makeopts file gets automatically created when running make, then
the Makefile does not get the contents of that file included.  The bug exposed
itself where libnewt was not found, but we tried to build it anyway.  This hack
prevents that from happening, but the larger issue needs to be addressed.  It
can be fixed once the actual building of the modules and userspace tools are
done by sub Makefiles ...

(closes issue #11199)
Reported by: dimas
Patches:
      newt_select_makefile.diff uploaded by tzafrir (license 46)

Modified:
    branches/1.4/Makefile
    branches/1.4/makeopts.in

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=3528&r1=3527&r2=3528
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Wed Dec 19 13:34:39 2007
@@ -255,7 +255,10 @@
 
 UTILSO		= $(UTILS:%=%.o)
 
-BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool ztscan
+BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest ztscan
+ifeq (1,$(PBX_LIBNEWT))
+  BINS+=zttool
+endif
 BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
 MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
 

Modified: branches/1.4/makeopts.in
URL: http://svn.digium.com/view/zaptel/branches/1.4/makeopts.in?view=diff&rev=3528&r1=3527&r2=3528
==============================================================================
--- branches/1.4/makeopts.in (original)
+++ branches/1.4/makeopts.in Wed Dec 19 13:34:39 2007
@@ -26,6 +26,7 @@
 
 DOWNLOAD=@DOWNLOAD@
 
+PBX_LIBNEWT=@PBX_LIBNEWT@
 NEWT_LIB=@NEWT_LIB@
 NEWT_INCLUDE=@NEWT_INCLUDE@