6 files changed, 27 insertions, 68 deletions
diff --git a/gnuradio-core/src/lib/hier/.gitignore b/gnuradio-core/src/lib/hier/.gitignore
deleted file mode 100644
index 89a768d46..000000000
--- a/gnuradio-core/src/lib/hier/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am
deleted file mode 100644
index 369feef75..000000000
--- a/gnuradio-core/src/lib/hier/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright 2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libhier.la
-
-libhier_la_SOURCES = \
-	gr_channel_model.cc
-
-grinclude_HEADERS = \
-	gr_channel_model.h
-
-swiginclude_HEADERS = \
-	hier.i \
-	gr_channel_model.i
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.cc b/gnuradio-core/src/lib/hier/gr_channel_model.cc
index 5f190e972..bb01972d2 100644
--- a/gnuradio-core/src/lib/hier/gr_channel_model.cc
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.cc
@@ -1,18 +1,18 @@
 /*
  * Copyright 2009 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,
@@ -46,23 +46,23 @@ gr_channel_model::gr_channel_model(double noise_voltage,
 				   const std::vector<gr_complex> &taps,
 				   double noise_seed)
   : gr_hier_block2("gr_channel_model",
-		   gr_make_io_signature(1, 1, sizeof(gr_complex)), 
+		   gr_make_io_signature(1, 1, sizeof(gr_complex)),
 		   gr_make_io_signature(1, 1, sizeof(gr_complex)))
 {
   d_taps = taps;
   while(d_taps.size() < 2) {
     d_taps.push_back(0);
   }
-  
+
   d_timing_offset = gr_make_fractional_interpolator_cc(0, epsilon);
-  
+
   d_multipath = gr_make_fir_filter_ccc(1, d_taps);
-  
+
   d_noise_adder = gr_make_add_cc();
   d_noise = gr_make_noise_source_c(GR_GAUSSIAN, noise_voltage, noise_seed);
   d_freq_offset = gr_make_sig_source_c(1, GR_SIN_WAVE, frequency_offset, 1.0, 0.0);
   d_mixer_offset = gr_make_multiply_cc();
-  
+
   connect(self(), 0, d_timing_offset, 0);
   connect(d_timing_offset, 0, d_multipath, 0);
   connect(d_multipath, 0, d_mixer_offset, 0);
@@ -77,13 +77,13 @@ gr_channel_model::set_noise_voltage(double noise_voltage)
 {
   d_noise->set_amplitude(noise_voltage);
 }
-   
+
 void
 gr_channel_model::set_frequency_offset(double frequency_offset)
 {
   d_freq_offset->set_frequency(frequency_offset);
 }
-     
+
 void
 gr_channel_model::set_taps(const std::vector<gr_complex> &taps)
 {
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.h b/gnuradio-core/src/lib/hier/gr_channel_model.h
index c5d06ce11..3f289e320 100644
--- a/gnuradio-core/src/lib/hier/gr_channel_model.h
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.h
@@ -1,18 +1,18 @@
 /*
  * Copyright 2009 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,
@@ -56,16 +56,16 @@ class GR_CORE_API gr_channel_model : public gr_hier_block2
 						     double epsilon,
 						     const std::vector<gr_complex> &taps,
 						     double noise_seed);
-  
+
   gr_fractional_interpolator_cc_sptr d_timing_offset;
   gr_sig_source_c_sptr d_freq_offset;
   gr_fir_filter_ccc_sptr d_multipath;
   gr_add_cc_sptr d_noise_adder;
   gr_noise_source_c_sptr d_noise;
   gr_multiply_cc_sptr d_mixer_offset;
-  
+
   std::vector<gr_complex> d_taps;
-  
+
  public:
   void set_noise_voltage(double noise_voltage);
   void set_frequency_offset(double frequency_offset);
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.i b/gnuradio-core/src/lib/hier/gr_channel_model.i
index 2e0cb7bdf..24a9388e5 100644
--- a/gnuradio-core/src/lib/hier/gr_channel_model.i
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.i
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
  * Copyright 2009 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,
@@ -36,7 +36,7 @@ class gr_channel_model : public gr_hier_block2
 		   double epsilon,
 		   const std::vector<gr_complex> &taps,
 		   double noise_seed);
-  
+
  public:
   void set_noise_voltage(double noise_voltage);
   void set_frequency_offset(double frequency_offset);
diff --git a/gnuradio-core/src/lib/hier/hier.i b/gnuradio-core/src/lib/hier/hier.i
index bec3de7ed..82044415e 100644
--- a/gnuradio-core/src/lib/hier/hier.i
+++ b/gnuradio-core/src/lib/hier/hier.i
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
  * Copyright 2009 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,