8 files changed, 23 insertions, 141 deletions
diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt
index 82e0fb2294..f94d901a1a 100644
--- a/gr-video-sdl/CMakeLists.txt
+++ b/gr-video-sdl/CMakeLists.txt
@@ -31,7 +31,7 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-video-sdl" ENABLE_GR_VIDEO_SDL
     SDL_FOUND
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
 )
 
 GR_SET_GLOBAL(GR_VIDEO_SDL_INCLUDE_DIRS
diff --git a/gr-video-sdl/gnuradio-video-sdl.pc.in b/gr-video-sdl/gnuradio-video-sdl.pc.in
index 8586a28842..3d26ff1816 100644
--- a/gr-video-sdl/gnuradio-video-sdl.pc.in
+++ b/gr-video-sdl/gnuradio-video-sdl.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: gnuradio-comedi
 Description: GNU Radio blocks for the SDL library
-Requires: gnuradio-core sdl
+Requires: gnuradio-runtime sdl
 Version: @LIBVER@
 Libs: -L${libdir} -lgnuradio-video-sdl
 Cflags: -I${includedir}
diff --git a/gr-video-sdl/include/video_sdl/api.h b/gr-video-sdl/include/video_sdl/api.h
index 5418f86f03..981292658c 100644
--- a/gr-video-sdl/include/video_sdl/api.h
+++ b/gr-video-sdl/include/video_sdl/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_VIDEO_SDL_API_H
 #define INCLUDED_VIDEO_SDL_API_H
 
-#include <gruel/attributes.h>
+#include <attributes.h>
 
 #ifdef gnuradio_video_sdl_EXPORTS
 #  define VIDEO_SDL_API __GR_ATTR_EXPORT
diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt
index 7df22e949c..f87ee3f007 100644
--- a/gr-video-sdl/lib/CMakeLists.txt
+++ b/gr-video-sdl/lib/CMakeLists.txt
@@ -22,8 +22,7 @@
 ########################################################################
 include_directories(
     ${GR_VIDEO_SDL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${SDL_INCLUDE_DIR}
@@ -46,14 +45,27 @@ list(APPEND video_sdl_sources
 )
 
 list(APPEND video_sdl_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${SDL_LIBRARY}
 )
 
+#Add Windows DLL resource file if using MSVC
+IF(MSVC)
+    include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake)
+
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-video-sdl.rc.in
+        ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.rc
+    @ONLY)
+
+    list(APPEND video_sdl_sources
+        ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.rc
+    )
+ENDIF(MSVC)
 
 add_library(gnuradio-video-sdl SHARED ${video_sdl_sources})
 target_link_libraries(gnuradio-video-sdl ${video_sdl_libs})
 GR_LIBRARY_FOO(gnuradio-video-sdl RUNTIME_COMPONENT "video_sdl_runtime" DEVEL_COMPONENT "video_sdl_devel")
 add_dependencies(gnuradio-video-sdl 
-  gnuradio-core)
+  gnuradio-runtime)
diff --git a/gr-video-sdl/src/gnuradio-video-sdl.rc.in b/gr-video-sdl/lib/gnuradio-video-sdl.rc.in
index c876b0f08a..c876b0f08a 100644
--- a/gr-video-sdl/src/gnuradio-video-sdl.rc.in
+++ b/gr-video-sdl/lib/gnuradio-video-sdl.rc.in
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
deleted file mode 100644
index 1e37505acc..0000000000
--- a/gr-video-sdl/src/CMakeLists.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2011-2013 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-########################################################################
-# Setup the include and linker paths
-########################################################################
-include_directories(
-    ${GR_VIDEO_SDL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${LOG4CXX_INCLUDE_DIRS}
-    ${SDL_INCLUDE_DIR}
-)
-
-link_directories(${Boost_LIBRARY_DIRS})
-
-########################################################################
-# Setup library
-########################################################################
-list(APPEND gr_video_sdl_sources
-    video_sdl_sink_uc.cc
-    video_sdl_sink_s.cc
-)
-
-#Add Windows DLL resource file if using MSVC
-if(MSVC)
-    include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake)
-
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-video-sdl.rc.in
-        ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.rc
-    @ONLY)
-
-    list(APPEND gr_uhd_sources
-        ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.rc
-    )
-endif(MSVC)
-
-list(APPEND video_sdl_libs
-    gnuradio-core
-    ${Boost_LIBRARIES}
-    ${SDL_LIBRARY}
-    ${LOG4CXX_LIBRARIES}
-)
-
-add_library(gnuradio-video-sdl SHARED ${gr_video_sdl_sources})
-target_link_libraries(gnuradio-video-sdl ${video_sdl_libs})
-GR_LIBRARY_FOO(gnuradio-video-sdl RUNTIME_COMPONENT "video_sdl_runtime" DEVEL_COMPONENT "video_sdl_devel")
-
-########################################################################
-# Install public header files
-########################################################################
-install(FILES
-    video_sdl_api.h
-    video_sdl_sink_uc.h
-    video_sdl_sink_s.h
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
-    COMPONENT "video_sdl_devel"
-)
-
-########################################################################
-# Setup swig generation
-########################################################################
-if(ENABLE_PYTHON)
-include(GrPython)
-include(GrSwig)
-
-set(GR_SWIG_INCLUDE_DIRS
-    ${GR_COMEDI_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-)
-
-set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
-
-set(GR_SWIG_LIBRARIES gnuradio-video-sdl)
-
-GR_SWIG_MAKE(video_sdl video_sdl.i)
-
-GR_SWIG_INSTALL(
-    TARGETS video_sdl
-    DESTINATION ${GR_PYTHON_DIR}/gnuradio
-    COMPONENT "video_sdl_python"
-)
-
-install(
-    FILES video_sdl.i
-    ${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "video_sdl_swig"
-)
-
-endif(ENABLE_PYTHON)
-
-########################################################################
-# Handle the unit tests
-########################################################################
-if(ENABLE_TESTING AND ENABLE_PYTHON)
-
-list(APPEND GR_TEST_PYTHON_DIRS
-    ${CMAKE_BINARY_DIR}/gr-video-sdl/src
-)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-video-sdl)
-
-include(GrTest)
-file(GLOB py_qa_test_files "qa_*.py")
-foreach(py_qa_test_file ${py_qa_test_files})
-    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
-endforeach(py_qa_test_file)
-endif(ENABLE_TESTING AND ENABLE_PYTHON)
diff --git a/gr-video-sdl/swig/CMakeLists.txt b/gr-video-sdl/swig/CMakeLists.txt
index 4c16be3ad5..4748a02d51 100644
--- a/gr-video-sdl/swig/CMakeLists.txt
+++ b/gr-video-sdl/swig/CMakeLists.txt
@@ -25,8 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_VIDEO_SDL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
@@ -40,7 +39,8 @@ endif(ENABLE_GR_CTRLPORT)
 # Setup swig docs to depend on includes and pull in from build directory
 set(GR_SWIG_TARGET_DEPS video_sdl_generated_includes)
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/video_sdl)
+set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
 
 set(GR_SWIG_LIBRARIES gnuradio-video-sdl)
 
diff --git a/gr-video-sdl/swig/video_sdl_swig.i b/gr-video-sdl/swig/video_sdl_swig.i
index 8561565901..d66201d670 100644
--- a/gr-video-sdl/swig/video_sdl_swig.i
+++ b/gr-video-sdl/swig/video_sdl_swig.i
@@ -22,7 +22,7 @@
 
 #define VIDEO_SDL_API
 
-%include "gnuradio.i"				// the common stuff
+%include "runtime_swig.i"				// the common stuff
 
 //load generated python docstrings
 %include "video_sdl_swig_doc.i"