Index: Makefile
===================================================================
--- Makefile	(revision 1274)
+++ Makefile	(working copy)
@@ -237,7 +237,7 @@
 
 tor2ee.o: tor2-hw.h
 
-tor2ee: LDFLAGS+=-lpci
+tor2ee: LDLIBS+=-lpci
 
 zonedata.lo: zonedata.c
 	$(CC) -c $(LCFLAGS) -o $@ $^
@@ -259,7 +259,7 @@
 
 makefw: CFLAGS=
 
-gendigits: LDFLAGS+=-lm
+gendigits: LDLIBS+=-lm
 gendigits: CFLAGS=
 
 fw2h: CFLAGS=
@@ -280,14 +280,14 @@
 
 ztspeed: CFLAGS=
 ztspeed.o: CFLAGS=
-zttool: LDFLAGS+=$(NEWT_LIB)
+zttool: LDLIBS+=$(NEWT_LIB)
 sethdlc-new.o: CFLAGS+=-I$(KINCLUDES)
 
 libtonezone.a: $(TZOBJS)
 	ar rcs libtonezone.a $^
 
 $(LIBTONEZONE_SO): $(TZOBJS)
-	$(CC) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) -lm -o $@ $^
+	$(CC) -shared -Wl,-soname,$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) -o $@ $^ -lm
 
 ztcfg.c: ztcfg.h
 
@@ -309,11 +309,11 @@
 complex.o: complex.cc
 	$(CC) -o $@ -c $^
 
-usbfxstest: LDFLAGS+=-lzap
+usbfxstest: LDLIBS+=-lzap
 fxstest: $(LIBTONEZONE_SO)
-fxstest: LDFLAGS+=-lm
-fxotune: LDFLAGS+=-lm
-fxsdump: LDFLAGS+=-lm
+fxstest: LDLIBS+=-lm
+fxotune: LDLIBS+=-lm
+fxsdump: LDLIBS+=-lm
 
 stackcheck: checkstack $(BUILDVER)
 	./checkstack *.o
@@ -328,7 +328,7 @@
 	$(MAKE) -C mISDNuser install
 
 $(UTILS): %: %.o
-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS)
 
 $(UTILSO): %.o: %.c
 	$(CC) $(CFLAGS) -o $@ -c $<