diff options
| author | eb | 2007-01-16 17:57:28 +0000 |
|---|---|---|
| committer | eb | 2007-01-16 17:57:28 +0000 |
| commit | 01eb527e0c1f445fab7c7cef039ba623e93f8c7c (patch) | |
| tree | 90d6508680043349eea02559d2a60122ad1c80bd /gnuradio-core/src | |
| parent | d23ea17ced9b398c97203e7ba1ad37d64f9812b1 (diff) | |
| download | gnuradio-01eb527e0c1f445fab7c7cef039ba623e93f8c7c.tar.gz gnuradio-01eb527e0c1f445fab7c7cef039ba623e93f8c7c.tar.bz2 gnuradio-01eb527e0c1f445fab7c7cef039ba623e93f8c7c.zip | |
fixed problem with gr_noise_source_* caused by splitting gnuradio_swig_python
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4280 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/general.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/Makefile.am | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/gengen.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/gr_noise_type.h (renamed from gnuradio-core/src/lib/general/gr_noise_type.h) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 30f6ba1db..3014ee05b 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -210,7 +210,6 @@ grinclude_HEADERS = \ gr_misc.h \ gr_nco.h \ gr_nlog10_ff.h \ - gr_noise_type.h \ gr_nop.h \ gr_null_sink.h \ gr_null_source.h \ diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 1bf752998..fe3ccacdf 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -27,7 +27,6 @@ #include <gr_null_source.h> #include <gr_head.h> #include <gr_skiphead.h> -#include <gr_noise_type.h> #include <gr_quadrature_demod_cf.h> #include <gr_remez.h> #include <gr_float_to_complex.h> @@ -117,7 +116,6 @@ %include "gr_null_source.i" %include "gr_head.i" %include "gr_skiphead.i" -%include "gr_noise_type.h" %include "gr_quadrature_demod_cf.i" %include "gr_remez.i" %include "gr_float_to_complex.i" diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index d5074634a..a338e39b7 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -110,6 +110,7 @@ libgengen_la_SOURCES = \ grinclude_HEADERS = \ $(GENERATED_H) \ gr_endianness.h \ + gr_noise_type.h \ gr_sig_source_waveform.h noinst_HEADERS = diff --git a/gnuradio-core/src/lib/gengen/gengen.i b/gnuradio-core/src/lib/gengen/gengen.i index 4047e430a..420b8ef5e 100644 --- a/gnuradio-core/src/lib/gengen/gengen.i +++ b/gnuradio-core/src/lib/gengen/gengen.i @@ -1,9 +1,11 @@ %{ #include "gr_endianness.h" #include "gr_sig_source_waveform.h" +#include "gr_noise_type.h" %} %include "gr_endianness.i" %include "gr_sig_source_waveform.h" +%include "gr_noise_type.h" %include "gengen_generated.i" diff --git a/gnuradio-core/src/lib/general/gr_noise_type.h b/gnuradio-core/src/lib/gengen/gr_noise_type.h index d04b7cafc..d04b7cafc 100644 --- a/gnuradio-core/src/lib/general/gr_noise_type.h +++ b/gnuradio-core/src/lib/gengen/gr_noise_type.h |