Update install targets and paths

CMakeLists.txt

@@ -187,10 +187,10 @@ install(
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include/gnuradio/iio)
+add_subdirectory(include/iio)
 add_subdirectory(lib)
 add_subdirectory(swig)
-add_subdirectory(python/iio)
+add_subdirectory(python)
 add_subdirectory(grc)
 
 ########################################################################

grc/iio_attr_sink.xml

@@ -3,7 +3,7 @@
   <name>IIO Attribute Sink</name>
   <key>iio_attr_sink</key>
   <category>[Industrial IO]</category>
-  <import>from gnuradio import iio</import>
+  <import>import iio</import>
   <make>iio.attr_sink($uri, $device, $channel, $attr_type, $output, $required_enable)</make>
   <param>
 		<name>uri</name>

grc/iio_attr_source.xml

@@ -3,7 +3,7 @@
   <name>IIO Attribute Source</name>
   <key>iio_attr_source</key>
   <category>[Industrial IO]</category>
-  <import>from gnuradio import iio</import>
+  <import>import iio</import>
   <make>iio.attr_source($uri, $device, $channel, $attribute, $update_interval_ms, $samples_per_update, $type, $attr_type, $output, $address, $required_enable)</make>
 
   <param>

grc/iio_attr_updater.xml

@@ -3,7 +3,7 @@
   <name>IIO Attribute Updater</name>
   <key>iio_attr_updater</key>
   <category>[Industrial IO]</category>
-  <import>from gnuradio import iio</import>
+  <import>import iio</import>
   <make>iio.attr_updater($attr, $value, $interval)</make>
   <callback>update_value($value)</callback>
   <param>

grc/iio_device_sink.xml

@@ -4,7 +4,7 @@
 	<key>iio_device_sink</key>
 	<category>[Industrial IO]</category>
 	<flags>throttle</flags>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.device_sink($uri, $device, $channels, $device_phy, $params, $buffer_size, $interpolation - 1, $cyclic)</make>
 
 	<param>

grc/iio_device_source.xml

@@ -4,7 +4,7 @@
 	<key>iio_device_source</key>
 	<category>[Industrial IO]</category>
 	<flags>throttle</flags>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.device_source($uri, $device, $channels, $device_phy, $params, $buffer_size, $decimation - 1)</make>
 
 	<param>

grc/iio_fmcomms2_sink.xml

@@ -4,7 +4,7 @@
 	<key>iio_fmcomms2_sink</key>
 	<category>[Industrial IO]/FMComms</category>
 	<flags>throttle</flags>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.fmcomms2_sink_f32c($uri, int($frequency), int($samplerate), int($bandwidth), $tx1_en, $tx2_en, $buffer_size, $cyclic, $rf_port_select, $attenuation1, $attenuation2, $filter, $auto_filter)</make>
 	<callback>set_params(int($frequency), int($samplerate), int($bandwidth), $rf_port_select, $attenuation1, $attenuation2, $filter, $auto_filter)</callback>
 

grc/iio_fmcomms2_source.xml

@@ -4,7 +4,7 @@
 	<key>iio_fmcomms2_source</key>
 	<category>[Industrial IO]/FMComms</category>
 	<flags>throttle</flags>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.fmcomms2_source_f32c($uri, int($frequency), int($samplerate), int($bandwidth), $rx1_en, $rx2_en, $buffer_size, $quadrature, $rfdc, $bbdc, $gain1, $manual_gain1, $gain2, $manual_gain2, $rf_port_select, $filter, $auto_filter)</make>
 	<callback>set_params(int($frequency), int($samplerate), int($bandwidth), $quadrature, $rfdc, $bbdc, $gain1, $manual_gain1, $gain2, $manual_gain2, $rf_port_select, $filter, $auto_filter)</callback>
 

grc/iio_fmcomms5_sink.xml

@@ -4,7 +4,7 @@
 	<key>iio_fmcomms5_sink</key>
 	<category>[Industrial IO]/FMComms</category>
 	<flags>throttle</flags>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.fmcomms5_sink_f32c($uri, int($frequency1), int($frequency2), int($samplerate), int($bandwidth), $ch1_en, $ch2_en, $ch3_en, $ch4_en, $buffer_size, $cyclic, $rf_port_select, $attenuation1, $attenuation2, $attenuation3, $attenuation4, $filter)</make>
 	<callback>set_params(int($frequency1), int($frequency2), int($samplerate), int($bandwidth), $rf_port_select, $attenuation1, $attenuation2, $attenuation3, $attenuation4)</callback>
 

grc/iio_fmcomms5_source.xml

@@ -4,7 +4,7 @@
 	<key>iio_fmcomms5_source</key>
 	<category>[Industrial IO]/FMComms</category>
 	<flags>throttle</flags>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.fmcomms5_source_f32c($uri, int($frequency1), int($frequency2), int($samplerate), int($bandwidth), $ch1_en, $ch2_en, $ch3_en, $ch4_en, $buffer_size, $quadrature, $rfdc, $bbdc, $gain1, $manual_gain1, $gain2, $manual_gain2, $gain3, $manual_gain3, $gain4, $manual_gain4, $rf_port_select, $filter)</make>
 	<callback>set_params(int($frequency1), int($frequency2), int($samplerate), int($bandwidth), $quadrature, $rfdc, $bbdc, $gain1, $manual_gain1, $gain2, $manual_gain2, $gain3, $manual_gain3, $gain4, $manual_gain4, $rf_port_select)</callback>
 

grc/iio_math.xml

@@ -3,7 +3,7 @@
 	<name>Function</name>
 	<key>math</key>
 	<category>[Industrial IO]/Math Operators</category>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.iio_math($function, $num_inputs)</make>
 
 	<param>

grc/iio_math_gen.xml

@@ -3,7 +3,7 @@
 	<name>Function Generator</name>
 	<key>math_gen</key>
 	<category>[Industrial IO]/Waveform Generators</category>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.iio_math_gen($samp_rate, $wav_freq, $function)</make>
 
 	<param>

grc/iio_modulo_const_ff.xml

@@ -3,7 +3,7 @@
 	<name>Modulo Const</name>
 	<key>iio_modulo_const_ff</key>
 	<category>[Industrial IO]/Math Operators</category>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.modulo_const_ff($modulo, $vlen)</make>
 	<param>
 		<name>Modulo</name>

grc/iio_modulo_ff.xml

@@ -3,7 +3,7 @@
 	<name>Modulo</name>
 	<key>iio_modulo_ff</key>
 	<category>[Industrial IO]/Math Operators</category>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.modulo_ff($vlen)</make>
 	<param>
 		<name>Vec Length</name>

grc/iio_pluto_sink.xml

@@ -4,7 +4,7 @@
 	<key>pluto_sink</key>
 	<category>[Industrial IO]/PlutoSDR</category>
 	<flags>throttle</flags>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.pluto_sink($uri, int($frequency), int($samplerate), int($bandwidth), $buffer_size, $cyclic, $attenuation, $filter, $auto_filter)</make>
 	<callback>set_params(int($frequency), int($samplerate), int($bandwidth), $attenuation, $filter, $auto_filter)</callback>
 

grc/iio_pluto_source.xml

@@ -4,7 +4,7 @@
 	<key>pluto_source</key>
 	<category>[Industrial IO]/PlutoSDR</category>
 	<flags>throttle</flags>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.pluto_source($uri, int($frequency), int($samplerate), int($bandwidth), $buffer_size, $quadrature, $rfdc, $bbdc, $gain, $manual_gain, $filter, $auto_filter)</make>
 	<callback>set_params(int($frequency), int($samplerate), int($bandwidth), $quadrature, $rfdc, $bbdc, $gain, $manual_gain, $filter, $auto_filter)</callback>
 

grc/iio_power_ff.xml

@@ -9,7 +9,7 @@
 	<name>Power</name>
 	<key>iio_power_ff</key>
 	<category>[Industrial IO]/Math Operators</category>
-	<import>from gnuradio import iio</import>
+	<import>import iio</import>
 	<make>iio.power_ff($vlen)</make>
 	<param>
 		<name>Vec Length</name>

include/gnuradio/iio/attr_sink.h → include/iio/attr_sink.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_ATTR_SINK_H
 #define INCLUDED_IIO_ATTR_SINK_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {

include/gnuradio/iio/attr_source.h → include/iio/attr_source.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_ATTR_SOURCE_H
 #define INCLUDED_IIO_ATTR_SOURCE_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {

include/gnuradio/iio/converter_ss.h → include/iio/converter_ss.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_CONVERTER_SS_H
 #define INCLUDED_IIO_CONVERTER_SS_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/sync_block.h>
 
 extern "C" {

include/gnuradio/iio/device_sink.h → include/iio/device_sink.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_DEVICE_SINK_H
 #define INCLUDED_IIO_DEVICE_SINK_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/sync_block.h>
 
 #define DEFAULT_BUFFER_SIZE 0x8000

include/gnuradio/iio/device_source.h → include/iio/device_source.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_DEVICE_SOURCE_H
 #define INCLUDED_IIO_DEVICE_SOURCE_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/sync_block.h>
 
 #define DEFAULT_BUFFER_SIZE 0x8000

include/gnuradio/iio/fmcomms2_sink.h → include/iio/fmcomms2_sink.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_FMCOMMS2_SINK_H
 #define INCLUDED_IIO_FMCOMMS2_SINK_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/sync_block.h>
 

include/gnuradio/iio/fmcomms2_source.h → include/iio/fmcomms2_source.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_FMCOMMS2_SOURCE_H
 #define INCLUDED_IIO_FMCOMMS2_SOURCE_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/sync_block.h>
 

include/gnuradio/iio/fmcomms5_sink.h → include/iio/fmcomms5_sink.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_FMCOMMS5_SINK_H
 #define INCLUDED_IIO_FMCOMMS5_SINK_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/sync_block.h>
 

include/gnuradio/iio/fmcomms5_source.h → include/iio/fmcomms5_source.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_FMCOMMS5_SOURCE_H
 #define INCLUDED_IIO_FMCOMMS5_SOURCE_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/sync_block.h>
 

include/gnuradio/iio/math.h → include/iio/math.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_MATH_H
 #define INCLUDED_IIO_MATH_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/hier_block2.h>
 
 namespace gr {

include/gnuradio/iio/modulo_const_ff.h → include/iio/modulo_const_ff.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_IIO_MODULO_CONST_FF_H
 #define INCLUDED_GR_IIO_MODULO_CONST_FF_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {

include/gnuradio/iio/modulo_ff.h → include/iio/modulo_ff.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_IIO_MODULO_FF_H
 #define INCLUDED_GR_IIO_MODULO_FF_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {

include/gnuradio/iio/pluto_sink.h → include/iio/pluto_sink.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_PLUTO_SINK_H
 #define INCLUDED_IIO_PLUTO_SINK_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/hier_block2.h>
 
 namespace gr {

include/gnuradio/iio/pluto_source.h → include/iio/pluto_source.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IIO_PLUTO_SOURCE_H
 #define INCLUDED_IIO_PLUTO_SOURCE_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/hier_block2.h>
 
 namespace gr {

include/gnuradio/iio/power_ff.h → include/iio/power_ff.h

@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_IIO_POWER_FF_H
 #define INCLUDED_GR_IIO_POWER_FF_H
 
-#include <gnuradio/iio/api.h>
+#include <iio/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {

lib/attr_sink_impl.h

@@ -23,7 +23,7 @@
 #define INCLUDED_IIO_ATTR_SINK_IMPL_H
 
 #include <iio.h>
-#include <gnuradio/iio/attr_sink.h>
+#include <iio/attr_sink.h>
 #include <pmt/pmt.h>
 
 #include "device_source_impl.h"

lib/attr_source_impl.h

@@ -22,7 +22,7 @@
 #ifndef INCLUDED_IIO_ATTR_SOURCE_IMPL_H
 #define INCLUDED_IIO_ATTR_SOURCE_IMPL_H
 
-#include <gnuradio/iio/attr_source.h>
+#include <iio/attr_source.h>
 #include <vector>
 
 #include "device_source_impl.h"

lib/converter_ss_impl.h

@@ -23,7 +23,7 @@
 #define INCLUDED_IIO_CONVERTER_SS_IMPL_H
 
 #include <iio.h>
-#include <gnuradio/iio/converter_ss.h>
+#include <iio/converter_ss.h>
 
 namespace gr {
 	namespace iio {

lib/device_sink_impl.h

@@ -26,7 +26,7 @@
 #include <vector>
 
 #include <iio.h>
-#include <gnuradio/iio/device_sink.h>
+#include <iio/device_sink.h>
 
 namespace gr {
   namespace iio {

lib/device_source_impl.h

@@ -27,7 +27,7 @@
 
 #include <iio.h>
 #include <boost/thread.hpp>
-#include <gnuradio/iio/device_source.h>
+#include <iio/device_source.h>
 
 namespace gr {
   namespace iio {

lib/fmcomms2_sink_impl.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#include <gnuradio/iio/fmcomms2_sink.h>
+#include <iio/fmcomms2_sink.h>
 
 #include "device_sink_impl.h"
 

lib/fmcomms2_source_impl.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#include <gnuradio/iio/fmcomms2_source.h>
+#include <iio/fmcomms2_source.h>
 
 #include "device_source_impl.h"
 

lib/fmcomms5_sink_impl.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#include <gnuradio/iio/fmcomms5_sink.h>
+#include <iio/fmcomms5_sink.h>
 
 #include "device_sink_impl.h"
 

lib/fmcomms5_source_impl.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#include <gnuradio/iio/fmcomms5_source.h>
+#include <iio/fmcomms5_source.h>
 
 #include "device_source_impl.h"
 

lib/iio_math_impl.cc

@@ -45,8 +45,8 @@
 #include <gnuradio/blocks/copy.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/blocks/transcendental.h>
-#include <gnuradio/iio/modulo_ff.h>
-#include <gnuradio/iio/power_ff.h>
+#include <iio/modulo_ff.h>
+#include <iio/power_ff.h>
 #include <gnuradio/io_signature.h>
 
 using namespace gr;

lib/iio_math_impl.h

@@ -25,7 +25,7 @@
 #include <vector>
 
 #include <gnuradio/basic_block.h>
-#include <gnuradio/iio/math.h>
+#include <iio/math.h>
 
 extern "C" {
 #include "parser.h"