summaryrefslogtreecommitdiff
path: root/gr-comedi
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-03-29 17:31:06 -0400
committerJohnathan Corgan <johnathan@corganlabs.com>2013-04-01 16:23:06 -0700
commitf74d3dae8f2ec423c61932b4ad0359f98b996a51 (patch)
tree1e16eb3537829248c177b04209acce3fe2bead96 /gr-comedi
parenteea0e411411303ea94953c5cd8454c4139a474ff (diff)
gruel: moved gruel into subdirs of gnuradio-runtime.
PMTs are handled slightly different and are installed into their own module and include dir.
Diffstat (limited to 'gr-comedi')
-rw-r--r--gr-comedi/include/comedi/api.h2
-rw-r--r--gr-comedi/lib/CMakeLists.txt1
-rw-r--r--gr-comedi/src/CMakeLists.txt1
-rw-r--r--gr-comedi/swig/CMakeLists.txt1
4 files changed, 1 insertions, 4 deletions
diff --git a/gr-comedi/include/comedi/api.h b/gr-comedi/include/comedi/api.h
index c9f9fbcae4..54aa18f317 100644
--- a/gr-comedi/include/comedi/api.h
+++ b/gr-comedi/include/comedi/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_COMEDI_API_H
#define INCLUDED_COMEDI_API_H
-#include <gruel/attributes.h>
+#include <attributes.h>
#ifdef gnuradio_comedi_EXPORTS
# define COMEDI_API __GR_ATTR_EXPORT
diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt
index 0179c8f537..57b4df11a4 100644
--- a/gr-comedi/lib/CMakeLists.txt
+++ b/gr-comedi/lib/CMakeLists.txt
@@ -23,7 +23,6 @@
include_directories(
${GR_COMEDI_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
- ${GRUEL_INCLUDE_DIRS}
${LOG4CXX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${COMEDI_INCLUDE_DIRS}
diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 4895c622a9..cc1e5a439d 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -23,7 +23,6 @@
include_directories(
${GR_COMEDI_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
- ${GRUEL_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${COMEDI_INCLUDE_DIRS}
)
diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt
index 5e7cc15229..7b490cb740 100644
--- a/gr-comedi/swig/CMakeLists.txt
+++ b/gr-comedi/swig/CMakeLists.txt
@@ -26,7 +26,6 @@ include(GrSwig)
set(GR_SWIG_INCLUDE_DIRS
${GR_COMEDI_INCLUDE_DIRS}
${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
- ${GRUEL_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)