some fixes for gnuradio 0.5

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1201 7ae35d74-ebe9-4afe-98af-79ac388436b8

gnuradio/Makefile.am

@@ -1,22 +1,21 @@
 
-INCLUDES = @INCLUDES@ @GNURADIO_FLAGS@
+CPPFLAGS = @GNURADIO_CFLAGS@
 
 lib_LTLIBRARIES = libhamlib-gnuradio.la
-libhamlib_gnuradio_la_SOURCES = gnuradio.cc gr.c
+libhamlib_gnuradio_la_SOURCES = gr.c gnuradio.cc
 
 libhamlib_gnuradio_la_LDFLAGS = -no-undefined -module -version-info 0:0:0
 
-# assumes we have libgnuradio, libfftw and c++
-#libhamlib_gnuradio_la_LIBADD = ../src/libhamlib.la @GNURADIO_LIBS@ -lstdc++
-libhamlib_gnuradio_la_LIBADD = ../src/libhamlib.la -L. -lgnuradio -lfftw -lrfftw -lstdc++
+# requires libgnuradio, libfftw and c++
+libhamlib_gnuradio_la_LIBADD = ../src/libhamlib.la @GNURADIO_LIBS@ -lstdc++
 
 noinst_HEADERS = gnuradio.h gr_priv.h
 
 
-noinst_PROGRAMS = testgr
+check_PROGRAMS = testgr
 
 testgr_SOURCES = testgr.cc
 testgr_LDADD = ../src/libhamlib.la @GNURADIO_LIBS@
-testgr_LDFLAGS = "-dlopen libhamlib-gnuradio.la"
+testgr_LDFLAGS = -dlopen libhamlib-gnuradio.la
 testgr_DEPENDENCIES = libhamlib-gnuradio.la ../src/libhamlib.la
 

gnuradio/gr_priv.h

@@ -2,7 +2,7 @@
  *  Hamlib GNUradio backend - gnuradio priv structure
  *  Copyright (c) 2001,2002 by Stephane Fillod
  *
- *	$Id: gr_priv.h,v 1.1 2002-07-06 09:27:38 fillods Exp $
+ *	$Id: gr_priv.h,v 1.2 2002-10-07 21:46:43 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -33,7 +33,7 @@
 
 #include <hamlib/rig.h>
 
-#define IOTYPE float
+#define IOTYPE short
 
 struct gnuradio_priv_data {
 	/* current vfo already in rig_state ? */

gnuradio/testgr.cc

@@ -17,7 +17,7 @@
 #include <VrSum.h>
 #include <VrConnect.h>
 #include <VrMultiTask.h>
-#include "VrGUI.h" 
+#include <VrGUI.h>
 
 #define SAMPLING_FREQUENCY                          5e6
 #define CARRIER_FREQ	          	        1.070e6	// AM 1070
@@ -44,6 +44,8 @@ int main(int argc, char *argv[])
 
   printf("testgr:hello, I am your main() !\n");
 
+  rig_set_debug(RIG_DEBUG_TRACE);
+
   my_rig = rig_init(RIG_MODEL_GNURADIO);
   if (!my_rig) {
 	fprintf(stderr,"Unknown rig num: %d\n", RIG_MODEL_GNURADIO);