Bug fixes to jsdr, keyer

[dttsp.git] / jDttSP / Makefile

diff --git a/jDttSP/Makefile b/jDttSP/Makefile
index 4c3905150209b2c728d56a4c99becfb2b441988d..b13744de0fa6b4ec5b7b3b1a824d5824b0413903 100644 (file)
--- a/jDttSP/Makefile
+++ b/jDttSP/Makefile
@@ -1,7 +1,7 @@
 CFLAGS = -g -O3 -I. -I/usr/local/include
 #CFLAGS = -g -I. -I/usr/local/include
-LIBS = -L/usr/local/lib -ljack -lpthread -lfftw -lm
-#LIBS = -lefence -L/usr/local/lib -ljack -lpthread -lfftw -lm
+LIBS = -L/usr/local/lib -ljack -lpthread -lgsl -lgslcblas -lfftw -lm
+#LIBS = -lefence -L/usr/local/lib -ljack -lpthread -lgsl -lgslcblas -lfftw -lm
 
 staticlibname=libDttSP.a
 
@@ -31,9 +31,20 @@ OBJ =        am_demod.o\
        window.o\
        update.o
 
+KOBJ = oscillator.o cwtones.o chan.o ringb.o banal.o bufvec.o splitfields.o cxops.o
+
 jsdr:  main.o $(OBJ)
        $(CC) -o jsdr main.o $(OBJ) $(LIBS)
 
+all:   jsdr mkchan ipc metermon keyd keyb
+
+keyd:  keyd.o keyer.o $(KOBJ)
+       $(CC) -o keyd keyd.o keyer.o $(KOBJ) $(LIBS)
+
+keyb:  keyb.o keyer.o $(KOBJ)
+       $(CC) -o keyb keyb.o keyer.o $(KOBJ) $(LIBS)
+
+
 $(OBJ): sdrexport.h
 
 metermon:      metermon.o chan.o ringb.o bufvec.o cxops.o banal.o
@@ -42,13 +53,14 @@ metermon:   metermon.o chan.o ringb.o bufvec.o cxops.o banal.o
 mkchan:        mkchan.o bufvec.o banal.o cxops.o
        $(CC) -o mkchan mkchan.o bufvec.o banal.o cxops.o $(LIBS)
 
-ipc:
+ipc:   mkchan
        ./setup-ipc
 
 obj:   $(OBJ)
 
 clean:
-       /bin/rm *.o jsdr mkchan metermon $(staticlibname)
+       /bin/rm *.o jsdr mkchan metermon keyd keyb #$(staticlibname)
+       #/bin/rm IPC/*
 
 staticlib:     $(OBJ)
        ar rcs $(staticlibname) $(OBJ)
@@ -60,3 +72,4 @@ staticlib:    $(OBJ)
 # sharedlib=$(sharedlibname).$(sharedlibvers)
 # sharedlib:   $(OBJ)
 #      gcc -shared -Wl,-soname,$(sharedlib) -o $(sharedlib) $(OBJ) -lc
+