[Commit-gnuradio] r5213 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband swig

[eb]

Author: eb
Date: 2007-05-01 16:44:43 -0600 (Tue, 01 May 2007)
New Revision: 5213

Modified:
   gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
   gnuradio/branches/developers/gnychis/inband/usrp/host/swig/Makefile.am
Log:
build cleanups

Modified: gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am      
2007-05-01 22:39:55 UTC (rev 5212)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am      
2007-05-01 22:44:43 UTC (rev 5213)
@@ -23,8 +23,6 @@
 
 INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS)
 
-USRP_LIB = $(top_builddir)/usrp/host/lib/legacy/libusrp.la
-
 bin_PROGRAMS =                         \
        usrper                          \
        usrp_cal_dc_offset              
@@ -45,13 +43,13 @@
 check_order_quickly_SOURCES    = check_order_quickly.cc
 
 test_usrp_standard_rx_SOURCES  = test_usrp_standard_rx.cc time_stuff.c
-test_usrp_standard_rx_LDADD    = $(USRP_LIB)
+test_usrp_standard_rx_LDADD    = $(USRP_LA)
 
 test_usrp_standard_tx_SOURCES  = test_usrp_standard_tx.cc time_stuff.c
-test_usrp_standard_tx_LDADD    = $(USRP_LIB)
+test_usrp_standard_tx_LDADD    = $(USRP_LA)
 
 usrper_SOURCES                 = usrper.cc
-usrper_LDADD                   = $(USRP_LIB)
+usrper_LDADD                   = $(USRP_LA)
 
 usrp_cal_dc_offset_SOURCES     = usrp_cal_dc_offset.cc
-usrp_cal_dc_offset_LDADD       = $(USRP_LIB)
+usrp_cal_dc_offset_LDADD       = $(USRP_LA)

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
   2007-05-01 22:39:55 UTC (rev 5212)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
   2007-05-01 22:44:43 UTC (rev 5213)
@@ -32,6 +32,7 @@
 #include <mb_protocol_class.h>
 #include <mb_class_registry.h>
 #include <vector>
+#include <iostream>
 
 static pmt_t s_cmd_allocate_channel = pmt_intern("cmd-allocate-channel");
 static pmt_t s_response_allocate_channel = 
pmt_intern("response-allocate-channel");

Modified: gnuradio/branches/developers/gnychis/inband/usrp/host/swig/Makefile.am
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/swig/Makefile.am      
2007-05-01 22:39:55 UTC (rev 5212)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/swig/Makefile.am      
2007-05-01 22:44:43 UTC (rev 5213)
@@ -64,7 +64,7 @@
 
 noinst_HEADERS =
 
-_usrp_prims_la_LIBADD  = $(top_builddir)/usrp/host/lib/legacy/libusrp.la 
-lstdc++ $(PYTHON_LDFLAGS)
+_usrp_prims_la_LIBADD  = $(USRP_LA) -lstdc++ $(PYTHON_LDFLAGS)
 _usrp_prims_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version