[Commit-gnuradio] r6186 - in gnuradio/branches/developers/jcorgan/fg: config gnuradio-core/src/lib/runtime gnuradio-examples gnuradio-examples/c++ gnuradio-examples/c++/dial_tone

[jcorgan]

Author: jcorgan
Date: 2007-08-27 12:24:17 -0600 (Mon, 27 Aug 2007)
New Revision: 6186

Modified:
   gnuradio/branches/developers/jcorgan/fg/config/grc_gnuradio_examples.m4
   
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/Makefile.am
   
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
   
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
   gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/Makefile.am
   gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/Makefile.am
   
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/README
Log:
Cleanup and prep for trunk merge.  Passes distcheck.

Modified: 
gnuradio/branches/developers/jcorgan/fg/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/fg/config/grc_gnuradio_examples.m4     
2007-08-27 07:14:29 UTC (rev 6185)
+++ gnuradio/branches/developers/jcorgan/fg/config/grc_gnuradio_examples.m4     
2007-08-27 18:24:17 UTC (rev 6186)
@@ -23,7 +23,6 @@
     AC_CONFIG_FILES([ \
         gnuradio-examples/Makefile \
        gnuradio-examples/c++/Makefile \
-       gnuradio-examples/c++/dial_tone/Makefile \
         gnuradio-examples/python/Makefile \
         gnuradio-examples/python/apps/hf_explorer/Makefile \
         gnuradio-examples/python/apps/hf_radio/Makefile \

Modified: 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/Makefile.am
   2007-08-27 07:14:29 UTC (rev 6185)
+++ 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/Makefile.am
   2007-08-27 18:24:17 UTC (rev 6186)
@@ -117,6 +117,7 @@
        qa_gr_hier_block2.h                     \
        qa_gr_buffer.h                          \
        qa_gr_io_signature.h                    \
+       qa_gr_top_block.h                       \
        qa_gr_vmcircbuf.h                       \
        qa_runtime.h                            
 

Modified: 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
        2007-08-27 07:14:29 UTC (rev 6185)
+++ 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc
        2007-08-27 18:24:17 UTC (rev 6186)
@@ -31,7 +31,7 @@
 #include <signal.h>
 #endif
 
-#define GR_SCHEDULER_THREAD_DEBUG 1
+#define GR_SCHEDULER_THREAD_DEBUG 0
 
 gr_scheduler_thread::gr_scheduler_thread(gr_block_vector_t graph) :
   omni_thread(NULL, PRIORITY_NORMAL),

Modified: 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
  2007-08-27 07:14:29 UTC (rev 6185)
+++ 
gnuradio/branches/developers/jcorgan/fg/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
  2007-08-27 18:24:17 UTC (rev 6186)
@@ -33,7 +33,7 @@
 #include <stdexcept>
 #include <iostream>
 
-#define GR_TOP_BLOCK_IMPL_DEBUG 1
+#define GR_TOP_BLOCK_IMPL_DEBUG 0
 
 static gr_top_block_impl *s_impl = 0;
 

Modified: gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/Makefile.am       
2007-08-27 07:14:29 UTC (rev 6185)
+++ gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/Makefile.am       
2007-08-27 18:24:17 UTC (rev 6186)
@@ -21,4 +21,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = python
+SUBDIRS = python c++

Modified: 
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/Makefile.am   
2007-08-27 07:14:29 UTC (rev 6185)
+++ gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/Makefile.am   
2007-08-27 18:24:17 UTC (rev 6186)
@@ -20,7 +20,4 @@
 # 
 
 include $(top_srcdir)/Makefile.common
-
-# FIXME: do not build automatically; need to detect required pre-requisites
-
 # SUBDIRS = dial_tone 

Modified: 
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/README
===================================================================
--- 
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/README  
    2007-08-27 07:14:29 UTC (rev 6185)
+++ 
gnuradio/branches/developers/jcorgan/fg/gnuradio-examples/c++/dial_tone/README  
    2007-08-27 18:24:17 UTC (rev 6186)
@@ -1,2 +1,16 @@
 This example requires that gr-audio-alsa be built in the main tree in order
 to compile successfully.  It is not built automatically.
+
+To build this example, you must make two modifications to the build system:
+
+1) Add the following line inside config/grc_gnuradio_examples.m4:
+
+   gnuradio-examples/c++/dial_tone/Makefile
+   
+   ...to the list of Makefiles already in there.
+   
+2) In gnuradio-examples/c++/Makefile.am, uncomment the SUBDIRS line
+
+# SUBDIRS = dial_tone
+
+Then, from the top-level directory, re-run ./bootstrap and ./configure.
\ No newline at end of file