[Commit-gnuradio] r4069 - in gnuradio/branches/developers/jcorgan/hier: gnuradio-core/src/lib/runtime gr-usrp/src

[jcorgan]

Author: jcorgan
Date: 2006-12-12 12:21:19 -0700 (Tue, 12 Dec 2006)
New Revision: 4069

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
   gnuradio/branches/developers/jcorgan/hier/gr-usrp/src/Makefile.am
Log:
Merge r4067:4068 from trunk and fix breakage.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
   2006-12-12 18:11:13 UTC (rev 4068)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/runtime.i
   2006-12-12 19:21:19 UTC (rev 4069)
@@ -21,12 +21,13 @@
  */
 
 %{
-#include <gr_runtime.h>
+#include <gr_runtime_types.h>
 #include <gr_io_signature.h>
 #include <gr_buffer.h>
 #include <gr_block.h>
 #include <gr_block_detail.h>
 #include <gr_hier_block2.h>
+#include <gr_runtime.h>
 #include <gr_simple_flowgraph.h>
 #include <gr_single_threaded_scheduler.h>
 #include <gr_message.h>

Modified: gnuradio/branches/developers/jcorgan/hier/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/hier/gr-usrp/src/Makefile.am   
2006-12-12 18:11:13 UTC (rev 4068)
+++ gnuradio/branches/developers/jcorgan/hier/gr-usrp/src/Makefile.am   
2006-12-12 19:21:19 UTC (rev 4069)
@@ -81,12 +81,9 @@
 
 ourlib_LTLIBRARIES = _usrp1.la
 
-lib_LTLIBRARIES = libgr_usrp.la
 
 _usrp1_la_SOURCES =                    \
-       usrp1.cc
-
-libgr_usrp_la_SOURCES =                        \
+       usrp1.cc                        \
        usrp1_sink_base.cc              \
        usrp1_sink_c.cc                 \
        usrp1_sink_s.cc                 \
@@ -94,28 +91,28 @@
        usrp1_source_c.cc               \
        usrp1_source_s.cc               
 
+
 _usrp1_la_LIBADD =                     \
        $(PYTHON_LDFLAGS)               \
-       libgr_usrp.la                   \
+       $(GNURADIO_CORE_LIBS)           \
+       $(USRP_LIBS)                    \
        -lstdc++
 
-libgr_usrp_la_LIBADD =                 \
-       $(GNURADIO_CORE_LIBS)           \
-       $(USRP_LIBS)
 
 _usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-libgr_usrp_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $(LOCAL_IFILES)
 
+
 noinst_PYTHON =                                \
        qa_usrp.py                      
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc
 
+
 # Don't distribute output of swig
 dist-hook:
        @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done