[svn-commits] trunk - r895 /trunk/Makefile

[svn-commits at lists.digium.com]

Author: mattf
Date: Thu Jan 12 15:02:19 2006
New Revision: 895

URL: http://svn.digium.com/view/zaptel?rev=895&view=rev
Log:
First of tzafrir's Makefile updates.  Fix userland progs depends (bug #4962)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=895&r1=894&r2=895&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jan 12 15:02:19 2006
@@ -134,7 +134,10 @@
 ifneq (,$(wildcard /usr/include/newt.h))
 ZTTOOL:=zttool
 endif
-BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL) zttest fxotune
+BINS:=ztcfg sethdlc-new ztmonitor ztspeed $(ZTTOOL) zttest fxotune
+UTILS:=tor2ee ztspeed zttool ztmonitor sethdlc-new \
+  usbfxstest fxstest fxotune fxsdump ztdiag
+UTILSO:=$(UTILS:%=%.o)
 
 #PRIMARY=wcfxsusb
 PRIMARY=torisa
@@ -208,8 +211,7 @@
 
 tor2ee.o: tor2-hw.h
 
-tor2ee: tor2ee.o
-	$(CC) $(CFLAGS) -o $@ $^ -lpci
+tor2ee: LDFLAGS+=-lpci
 
 zonedata.lo: zonedata.c
 	$(CC) -c $(LCFLAGS) -o $@ $^
@@ -229,8 +231,7 @@
 radfw.h: makefw pciradio.rbt
 	./makefw pciradio.rbt radfw > radfw.h
 
-gendigits: gendigits.o
-	$(CC) -o $@ $^ -lm
+gendigits: LDFLAGS+=-lm
 
 zaptel.c: tones.h 
 
@@ -242,23 +243,10 @@
 
 ztmonitor.o: ztmonitor.c zaptel.h
 
-ztspeed.o: ztspeed.c
-	$(CC) -o $@ -c $^
-
-zttool: zttool.o
-	$(CC) -o $@ $^ -lnewt
-
-ztmonitor: ztmonitor.o
-	$(CC) -o $@ $^
-
-ztspeed: ztspeed.o
-	$(CC) -o $@ $^
-
-sethdlc-new: sethdlc-new.o
-	$(CC) -o $@ $^
-
-sethdlc-new.o: sethdlc-new.c
-	$(CC) -o $@ -c $(CFLAGS) -I$(KINCLUDES) $^
+ztspeed: CFLAGS=
+ztspeed.o: CFLAGS=
+zttool: LDFLAGS+=-lnewt
+sethdlc-new.o: CFLAGS+=-I$(KINCLUDES)
 
 libtonezone.a: $(TZOBJS)
 	ar rcs libtonezone.a $^
@@ -283,26 +271,20 @@
 complex.o: complex.cc
 	$(CC) -o $@ -c $^
 
-usbfxstest.o: usbfxstest.c
-	$(CC) -o $@ -g -c $^
-
-usbfxstest: usbfxstest.o 
-	$(CC) -o $@ $^ -lzap
-
-fxstest: fxstest.o $(LIBTONEZONE_SO)
-	$(CC) -o $@ $^ -lm
-
-fxotune: fxotune.o
-	$(CC) -o $@ $^ -lm
-
-fxsdump: fxsdump.o
-	$(CC) -o $@ $^ -lm
+usbfxstest: LDFLAGS+=-lzap
+fxstest: $(LIBTONEZONE_SO)
+fxstest: LDFLAGS+=-lm
+fxotune: LDFLAGS+=-lm
+fxsdump: LDFLAGS+=-lm
 
 stackcheck: checkstack $(BUILDVER)
 	./checkstack *.o
 
-ztdiag: ztdiag.o 
-	$(CC) -o $@ $^
+$(UTILS): %: %.o
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+
+$(UTILSO): %.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 devices:
 ifndef DYNFS