9 files changed, 15 insertions, 18 deletions
diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt
index ad9418334e..171802610a 100644
--- a/gr-fec/CMakeLists.txt
+++ b/gr-fec/CMakeLists.txt
@@ -29,8 +29,7 @@ include(GrComponent)
 
 GR_REGISTER_COMPONENT("gr-fec" ENABLE_GR_FEC
     Boost_FOUND
-    ENABLE_GRUEL
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_BLOCKS
 )
 
diff --git a/gr-fec/gnuradio-fec.pc.in b/gr-fec/gnuradio-fec.pc.in
index 3e0d308da7..3089ec32fd 100644
--- a/gr-fec/gnuradio-fec.pc.in
+++ b/gr-fec/gnuradio-fec.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: gnuradio-fec
 Description: GNU Radio's FEC signal processing blocks
-Requires: gnuradio-core
+Requires: gnuradio-runtime
 Version: @LIBVER@
 Libs: -L${libdir} -lgnuradio-fec
 Cflags: -I${includedir}
diff --git a/gr-fec/include/fec/CMakeLists.txt b/gr-fec/include/fec/CMakeLists.txt
index 2d49dbe301..7ab0498000 100644
--- a/gr-fec/include/fec/CMakeLists.txt
+++ b/gr-fec/include/fec/CMakeLists.txt
@@ -26,7 +26,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
diff --git a/gr-fec/include/fec/api.h b/gr-fec/include/fec/api.h
index e6d8ca5e99..62c0fd98de 100644
--- a/gr-fec/include/fec/api.h
+++ b/gr-fec/include/fec/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_FEC_API_H
 #define INCLUDED_FEC_API_H
 
-#include <gruel/attributes.h>
+#include <attributes.h>
 
 #ifdef gnuradio_fec_EXPORTS
 #  define FEC_API __GR_ATTR_EXPORT
diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt
index f012c8d2e8..29eb36bd1c 100644
--- a/gr-fec/lib/CMakeLists.txt
+++ b/gr-fec/lib/CMakeLists.txt
@@ -29,8 +29,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_FEC_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
@@ -46,7 +45,7 @@ list(APPEND gnuradio_fec_sources
 
 #Add Windows DLL resource file if using MSVC
 if(MSVC)
-    include(${CMAKE_INSTALL_PREFIX}/cmake/Modules/GrVersion.cmake)
+    include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake)
 
     configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-fec.rc.in
@@ -59,7 +58,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND gnuradio_fec_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
 )
 
diff --git a/gr-fec/lib/viterbi/CMakeLists.txt b/gr-fec/lib/viterbi/CMakeLists.txt
index 6605556a84..3697787bcc 100644
--- a/gr-fec/lib/viterbi/CMakeLists.txt
+++ b/gr-fec/lib/viterbi/CMakeLists.txt
@@ -41,7 +41,7 @@ list(APPEND viterbi_sources ${CMAKE_CURRENT_BINARY_DIR}/boost_math_erf.cc)
 endif(MSVC)
 
 ########################################################################
-# Append gnuradio-core library sources
+# Append gnuradio-runtime library sources
 ########################################################################
 list(APPEND gnuradio_fec_sources ${viterbi_sources})
 
diff --git a/gr-fec/python/qa_ecc_ccsds_27.py b/gr-fec/python/qa_ecc_ccsds_27.py
index 52615abe23..895e683345 100755
--- a/gr-fec/python/qa_ecc_ccsds_27.py
+++ b/gr-fec/python/qa_ecc_ccsds_27.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2007,2010 Free Software Foundation, Inc.
+# Copyright 2004,2007,2010,2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -35,13 +35,13 @@ class test_ccsds_27 (gr_unittest.TestCase):
     def xtest_ccsds_27 (self):
         src_data = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
 	expected = (0, 0, 0, 0, 1, 2, 3, 4, 5, 6)
-        src = gr.vector_source_b(src_data)
+        src = blocks.vector_source_b(src_data)
 	enc = fec.encode_ccsds_27_bb()
 	b2f = blocks.char_to_float()
 	add = blocks.add_const_ff(-0.5)
 	mul = blocks.multiply_const_ff(2.0)
 	dec = fec.decode_ccsds_27_fb()
-	dst = gr.vector_sink_b()
+	dst = blocks.vector_sink_b()
 	self.tb.connect(src, enc, b2f, add, mul, dec, dst)
 	self.tb.run()
 	dst_data = dst.data()
diff --git a/gr-fec/swig/CMakeLists.txt b/gr-fec/swig/CMakeLists.txt
index 60178827e5..1f623b6dcc 100644
--- a/gr-fec/swig/CMakeLists.txt
+++ b/gr-fec/swig/CMakeLists.txt
@@ -26,14 +26,13 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_FEC_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fec_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
-
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fec)
+set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
 set(GR_SWIG_LIBRARIES gnuradio-fec)
 
 GR_SWIG_MAKE(fec_swig fec_swig.i)
diff --git a/gr-fec/swig/fec_swig.i b/gr-fec/swig/fec_swig.i
index 3ffed89d27..5a50b63777 100644
--- a/gr-fec/swig/fec_swig.i
+++ b/gr-fec/swig/fec_swig.i
@@ -22,7 +22,7 @@
 
 #define FEC_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "fec_swig_doc.i"