[svn-commits] branch group/menuselect r1143 - /team/group/menuselect/Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Jun 20 10:04:03 2006
New Revision: 1143

URL: http://svn.digium.com/view/zaptel?rev=1143&view=rev
Log:
use autoconf info for building zttool

Modified:
    team/group/menuselect/Makefile

Modified: team/group/menuselect/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/Makefile?rev=1143&r1=1142&r2=1143&view=diff
==============================================================================
--- team/group/menuselect/Makefile (original)
+++ team/group/menuselect/Makefile Tue Jun 20 10:04:03 2006
@@ -160,9 +160,6 @@
 obj-m+=xpp/
 endif
 
-ifneq (,$(wildcard /usr/include/newt.h))
-ZTTOOL:=zttool
-endif
 BINS:=$(MENUSELECT_UTILS)
 UTILS:=$(filter-out ztcfg,$(MENUSELECT_UTILS))
 UTILSO:=$(UTILS:%=%.o)
@@ -260,6 +257,7 @@
 prereq: tones.h tor2fw.h radfw.h version.h
 
 zttool.o: zttool.c zaptel.h
+	$(CC) -g -c $(NEWT_INCLUDE) $(CFLAGS) -o $@ $<
 
 ztprovision.o: ztprovision.c zaptel.h
 
@@ -267,7 +265,7 @@
 
 ztspeed: CFLAGS=
 ztspeed.o: CFLAGS=
-zttool: LDFLAGS+=-lnewt
+zttool: LDFLAGS+=$(NEWT_LIB)
 sethdlc-new.o: CFLAGS+=-I$(KINCLUDES)
 
 libtonezone.a: $(TZOBJS)