7 files changed, 28 insertions, 23 deletions
diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt
index da0ac45b58..cb53a07304 100644
--- a/gr-wavelet/CMakeLists.txt
+++ b/gr-wavelet/CMakeLists.txt
@@ -31,7 +31,7 @@ include(GrComponent)
 
 GR_REGISTER_COMPONENT("gr-wavelet" ENABLE_GR_WAVELET
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_BLOCKS
     ENABLE_GR_ANALOG
     GSL_FOUND
diff --git a/gr-wavelet/gnuradio-wavelet.pc.in b/gr-wavelet/gnuradio-wavelet.pc.in
index 998ae90564..c9c9f00a93 100644
--- a/gr-wavelet/gnuradio-wavelet.pc.in
+++ b/gr-wavelet/gnuradio-wavelet.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: gnuradio-wavelet
 Description: Wavelet signal processing blocks for GNU Radio
-Requires: gnuradio-core
+Requires: gnuradio-runtime
 Version: @LIBVER@
 Libs: -L${libdir} -lgnuradio-wavelet
 Cflags: -I${includedir}
diff --git a/gr-wavelet/include/wavelet/api.h b/gr-wavelet/include/wavelet/api.h
index 68b2c04d78..f1b281440d 100644
--- a/gr-wavelet/include/wavelet/api.h
+++ b/gr-wavelet/include/wavelet/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_WAVELET_API_H
 #define INCLUDED_WAVELET_API_H
 
-#include <gruel/attributes.h>
+#include <attributes.h>
 
 #ifdef gnuradio_wavelet_EXPORTS
 #  define WAVELET_API __GR_ATTR_EXPORT
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index 090392f584..eb01d7d1cb 100644
--- a/gr-wavelet/lib/CMakeLists.txt
+++ b/gr-wavelet/lib/CMakeLists.txt
@@ -25,8 +25,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_WAVELET_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${GSL_INCLUDE_DIRS}
@@ -44,6 +43,10 @@ if(ENABLE_GR_CTRLPORT)
   include_directories(${ICE_INCLUDE_DIR})
 endif(ENABLE_GR_CTRLPORT)
 
+include_directories(${LOG4CPP_INCLUDE_DIRS})
+link_directories(${LOG4CPP_LIBRARY_DIRS})
+
+
 ########################################################################
 # Setup library
 ########################################################################
@@ -68,12 +71,12 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND wavelet_libs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-blocks
     ${Boost_LIBRARIES}
     ${WAVELET_LIBRARIES}
     ${GSL_LIBRARIES}
-    ${LOG4CXX_LIBRARIES}
+    ${LOG4CPP_LIBRARIES}
 )
 
 add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources})
@@ -81,4 +84,4 @@ target_link_libraries(gnuradio-wavelet ${wavelet_libs})
 GR_LIBRARY_FOO(gnuradio-wavelet RUNTIME_COMPONENT "wavelet_runtime" DEVEL_COMPONENT "wavelet_devel")
 add_dependencies(gnuradio-wavelet
   wavelet_generated_includes wavelet_generated_swigs
-  gnuradio-core)
+  gnuradio-runtime)
diff --git a/gr-wavelet/python/wavelet/qa_classify.py b/gr-wavelet/python/wavelet/qa_classify.py
index efb8cb3d4c..4752620f4d 100755
--- a/gr-wavelet/python/wavelet/qa_classify.py
+++ b/gr-wavelet/python/wavelet/qa_classify.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2008,2010 Free Software Foundation, Inc.
+# Copyright 2008,2010,2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -48,8 +48,8 @@ class test_classify(gr_unittest.TestCase):
 #     def test_000_(self):
 #         src_data = numpy.zeros(10)
 #         trg_data = numpy.zeros(10)
-#         src = gr.vector_source_f(src_data)
-#         dst = gr.vector_sink_f()
+#         src = blocks.vector_source_f(src_data)
+#         dst = blocks.vector_sink_f()
 #         self.tb.connect(src, dst)
 #         self.tb.run()
 #         rsl_data = dst.data()
@@ -63,8 +63,8 @@ class test_classify(gr_unittest.TestCase):
     def test_001_(self):
         src_data = numpy.array([-1.0, 1.0, -1.0, 1.0])
         trg_data = src_data * 0.5
-        src = gr.vector_source_f(src_data)
-        dst = gr.vector_sink_f()
+        src = blocks.vector_source_f(src_data)
+        dst = blocks.vector_sink_f()
         rail = analog.rail_ff(-0.5, 0.5)
         self.tb.connect(src, rail)
         self.tb.connect(rail, dst)
@@ -85,9 +85,9 @@ class test_classify(gr_unittest.TestCase):
                                 -1.0/5.0])
         trg_data = copy.deepcopy(src_data)
 
-        src = gr.vector_source_f(src_data, False, len(src_data))
+        src = blocks.vector_source_f(src_data, False, len(src_data))
         st = blocks.stretch_ff(-1.0/5.0, len(src_data))
-        dst = gr.vector_sink_f(len(src_data))
+        dst = blocks.vector_sink_f(len(src_data))
         self.tb.connect(src, st)
         self.tb.connect(st, dst)
         self.tb.run()
@@ -104,9 +104,9 @@ class test_classify(gr_unittest.TestCase):
         trg_grid = copy.deepcopy(src_grid)
         src_data = (0.0, 1.0, 0.0, 1.0, 0.0)
 
-        src = gr.vector_source_f(src_data, False, len(src_grid))
+        src = blocks.vector_source_f(src_data, False, len(src_grid))
         sq = wavelet.squash_ff(src_grid, trg_grid)
-        dst = gr.vector_sink_f(len(trg_grid))
+        dst = blocks.vector_sink_f(len(trg_grid))
         self.tb.connect(src, sq)
         self.tb.connect(sq, dst)
         self.tb.run()
@@ -132,8 +132,10 @@ class test_classify(gr_unittest.TestCase):
 #
 #        src = gr.vector_source_f(b, False, n)
 #        wv = wavelet.wavelet_ff(n, o, True)
+#        src = blocks.vector_source_f(b, False, n)
+#        wv = wavelet.wavelet_ff(n, o, True)
 #
-#        dst = gr.vector_sink_f(n)
+#        dst = blocks.vector_sink_f(n)
 #        self.tb.connect(src, wv)
 #        self.tb.connect(wv, dst)
 #        self.tb.run()
@@ -159,9 +161,9 @@ class test_classify(gr_unittest.TestCase):
             wvps[e] = scl*sqr(dwav[k:k+(01<<e)]).sum()
             k += 01<<e
 
-        src = gr.vector_source_f(src_data, False, len(src_data))
+        src = blocks.vector_source_f(src_data, False, len(src_data))
         kon = wavelet.wvps_ff(len(src_data))
-        dst = gr.vector_sink_f(int(math.ceil(math.log(len(src_data), 2))))
+        dst = blocks.vector_sink_f(int(math.ceil(math.log(len(src_data), 2))))
 
         self.tb.connect(src, kon)
         self.tb.connect(kon, dst)
diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt
index 0c78c8936f..817d4fe920 100644
--- a/gr-wavelet/swig/CMakeLists.txt
+++ b/gr-wavelet/swig/CMakeLists.txt
@@ -26,14 +26,14 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_WAVELET_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${GSL_INCLUDE_DIRS}
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/wavelet_swig_doc.i)
 set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/wavelet)
+set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
 
 set(GR_SWIG_LIBRARIES gnuradio-wavelet ${GSL_LDFLAGS})
 
diff --git a/gr-wavelet/swig/wavelet_swig.i b/gr-wavelet/swig/wavelet_swig.i
index 40fe3f9b5e..d9b8e3144b 100644
--- a/gr-wavelet/swig/wavelet_swig.i
+++ b/gr-wavelet/swig/wavelet_swig.i
@@ -22,7 +22,7 @@
 
 #define WAVELET_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "wavelet_swig_doc.i"