From 01eb527e0c1f445fab7c7cef039ba623e93f8c7c Mon Sep 17 00:00:00 2001 From: eb Date: Tue, 16 Jan 2007 17:57:28 +0000 Subject: [PATCH] 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 --- gnuradio-core/src/lib/general/Makefile.am | 1 - gnuradio-core/src/lib/general/general.i | 2 -- gnuradio-core/src/lib/gengen/Makefile.am | 1 + gnuradio-core/src/lib/gengen/gengen.i | 2 ++ gnuradio-core/src/lib/{general => gengen}/gr_noise_type.h | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename gnuradio-core/src/lib/{general => gengen}/gr_noise_type.h (100%) diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 30f6ba1d..3014ee05 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 1bf75299..fe3ccacd 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -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 d5074634..a338e39b 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 4047e430..420b8ef5 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 similarity index 100% rename from gnuradio-core/src/lib/general/gr_noise_type.h rename to gnuradio-core/src/lib/gengen/gr_noise_type.h -- 2.47.2