Major changes. Added metering and power spectrum, other fixes. Rearranged headers...

[dttsp.git] / jDttSP / Makefile

diff --git a/jDttSP/Makefile b/jDttSP/Makefile
index f2e978ebbd067df0ea31e93896656eb8b64d121e..d9bfdeba3da9ae74f4355888f7efca5d38a56085 100644 (file)
--- a/jDttSP/Makefile
+++ b/jDttSP/Makefile
@@ -1,5 +1,5 @@
-CFLAGS = -g -O3 -I. -I/usr/local/include
-#CFLAGS = -g -I. -I/usr/local/include
+#CFLAGS = -g -O3 -I. -I/usr/local/include
+CFLAGS = -g -I. -I/usr/local/include
 LIBS = -L/usr/local/lib -ljack -lpthread -lgsl -lgslcblas -lfftw -lm
 #LIBS = -lefence -L/usr/local/lib -ljack -lpthread -lgsl -lgslcblas -lfftw -lm
 
@@ -18,12 +18,14 @@ OBJ =       am_demod.o\
        filter.o\
        fm_demod.o\
        lmadf.o\
+       meter.o\
        noiseblanker.o\
        oscillator.o\
        ovsv.o\
        ringb.o\
        sdr.o\
        sdrexport.o\
+       spectrum.o\
        speechproc.o\
        splitfields.o\
        spottone.o\
@@ -36,7 +38,7 @@ KOBJ = oscillator.o cwtones.o chan.o ringb.o banal.o bufvec.o splitfields.o cxop
 jsdr:  main.o $(OBJ)
        $(CC) -o jsdr main.o $(OBJ) $(LIBS)
 
-all:   jsdr mkchan ipc metermon keyd keyb
+all:   jsdr mkchan ipc metermon specmon keyd keyb
 
 keyd:  keyd.o keyer.o $(KOBJ)
        $(CC) -o keyd keyd.o keyer.o $(KOBJ) $(LIBS)
@@ -47,11 +49,11 @@ keyb:       keyb.o keyer.o $(KOBJ)
 
 $(OBJ): sdrexport.h
 
-metermon:      metermon.o chan.o ringb.o bufvec.o cxops.o banal.o
-       $(CC) -o metermon metermon.o chan.o ringb.o bufvec.o cxops.o banal.o $(LIBS)
+metermon:      metermon.o 
+       $(CC) -o metermon metermon.o $(LIBS)
 
-mkchan:        mkchan.o bufvec.o banal.o cxops.o
-       $(CC) -o mkchan mkchan.o bufvec.o banal.o cxops.o $(LIBS)
+specmon:       specmon.o 
+       $(CC) -o specmon specmon.o $(LIBS)
 
 ipc:   mkchan
        ./setup-ipc
@@ -59,13 +61,16 @@ ipc:        mkchan
 obj:   $(OBJ)
 
 clean:
-       /bin/rm *.o jsdr mkchan metermon keyd #$(staticlibname)
+       /bin/rm *.o jsdr keyb keyd metermon #$(staticlibname)
        #/bin/rm IPC/*
 
 staticlib:     $(OBJ)
        ar rcs $(staticlibname) $(OBJ)
        ranlib $(staticlibname)
 
+#mkchan:       mkchan.o bufvec.o banal.o cxops.o
+#      $(CC) -o mkchan mkchan.o bufvec.o banal.o cxops.o $(LIBS)
+
 #CFLAGS = -fPIC -g -O3 -I. -I/usr/local/include
 # sharedlibname=libDttSP.so
 # sharedlibvers=0.0.1