gr-digital: updating build for consetellation object move.

4 files changed, 3 insertions, 22 deletions

diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index 3b8997d8c..de1e50f0e 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -56,10 +56,7 @@ libgeneral_la_SOURCES = 		\
 	gr_complex_to_xxx.cc		\
 	gr_conjugate_cc.cc		\
 	gr_copy.cc			\
-	gr_constellation.cc             \
 	gr_constellation_decoder_cb.cc	\
-	gr_constellation_decoder2_cb.cc	\
-	gr_constellation_receiver_cb.cc \
 	gr_correlate_access_code_bb.cc	\
 	gr_costas_loop_cc.cc		\
 	gr_count_bits.cc		\
@@ -114,7 +111,6 @@ libgeneral_la_SOURCES = 		\
         gr_ofdm_demapper_vcb.cc         \
         gr_ofdm_mapper_bcv.cc           \
 	gr_ofdm_frame_sink.cc		\
-	gr_ofdm_frame_sink2.cc		\
 	gr_ofdm_insert_preamble.cc	\
         gr_ofdm_sampler.cc              \
 	gr_pa_2x2_phase_combiner.cc	\
@@ -217,10 +213,7 @@ grinclude_HEADERS = 			\
 	gr_complex_to_interleaved_short.h \
 	gr_complex_to_xxx.h		\
 	gr_conjugate_cc.h		\
-	gr_constellation.h	        \
 	gr_constellation_decoder_cb.h	\
-	gr_constellation_decoder2_cb.h	\
-	gr_constellation_receiver_cb.h	\
 	gr_copy.h			\
 	gr_correlate_access_code_bb.h	\
 	gr_costas_loop_cc.h		\
@@ -281,7 +274,6 @@ grinclude_HEADERS = 			\
         gr_ofdm_demapper_vcb.h          \
         gr_ofdm_mapper_bcv.h            \
         gr_ofdm_frame_sink.h		\
-        gr_ofdm_frame_sink2.h		\
 	gr_ofdm_insert_preamble.h	\
 	gr_ofdm_sampler.h               \
 	gr_pa_2x2_phase_combiner.h	\
@@ -396,10 +388,7 @@ swiginclude_HEADERS =			\
 	gr_complex_to_interleaved_short.i \
 	gr_complex_to_xxx.i		\
 	gr_conjugate_cc.i		\
-	gr_constellation.i	        \
 	gr_constellation_decoder_cb.i	\
-	gr_constellation_decoder2_cb.i	\
-	gr_constellation_receiver_cb.i	\
 	gr_copy.i			\
 	gr_correlate_access_code_bb.i	\
 	gr_costas_loop_cc.i		\
@@ -450,7 +439,6 @@ swiginclude_HEADERS =			\
         gr_ofdm_demapper_vcb.i          \
         gr_ofdm_mapper_bcv.i            \
         gr_ofdm_frame_sink.i		\
-        gr_ofdm_frame_sink2.i		\
 	gr_ofdm_insert_preamble.i	\
 	gr_ofdm_sampler.i               \
 	gr_pa_2x2_phase_combiner.i	\
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index d9648ef64..5a5534129 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -70,8 +70,6 @@
 #include <gr_fake_channel_coder_pp.h>
 #include <gr_throttle.h>
 #include <gr_mpsk_receiver_cc.h>
-#include <gr_constellation_receiver_cb.h>
-#include <gr_constellation.h>
 #include <gr_stream_mux.h>
 #include <gr_stream_to_streams.h>
 #include <gr_streams_to_stream.h>
@@ -100,7 +98,7 @@
 #include <gr_ofdm_cyclic_prefixer.h>
 #include <gr_ofdm_mapper_bcv.h>
 #include <gr_ofdm_frame_sink.h>
-#include <gr_ofdm_frame_sink2.h>
+  //#include <gr_ofdm_frame_sink2.h>
 #include <gr_ofdm_insert_preamble.h>
 #include <gr_ofdm_sampler.h>
 #include <gr_regenerate_bb.h>
@@ -115,7 +113,6 @@
 #include <gr_correlate_access_code_bb.h>
 #include <gr_diff_phasor_cc.h>
 #include <gr_constellation_decoder_cb.h>
-#include <gr_constellation_decoder2_cb.h>
 #include <gr_binary_slicer_fb.h>
 #include <gr_diff_encoder_bb.h>
 #include <gr_diff_decoder_bb.h>
@@ -200,8 +197,6 @@
 %include "gr_fake_channel_coder_pp.i"
 %include "gr_throttle.i"
 %include "gr_mpsk_receiver_cc.i"
-%include "gr_constellation_receiver_cb.i"
-%include "gr_constellation.i"
 %include "gr_stream_mux.i"
 %include "gr_stream_to_streams.i"
 %include "gr_streams_to_stream.i"
@@ -230,7 +225,7 @@
 %include "gr_ofdm_cyclic_prefixer.i"
 %include "gr_ofdm_mapper_bcv.i"
 %include "gr_ofdm_frame_sink.i"
-%include "gr_ofdm_frame_sink2.i"
+ //%include "gr_ofdm_frame_sink2.i"
 %include "gr_ofdm_insert_preamble.i"
 %include "gr_ofdm_sampler.i"
 %include "gr_regenerate_bb.i"
@@ -245,7 +240,6 @@
 %include "gr_correlate_access_code_bb.i"
 %include "gr_diff_phasor_cc.i"
 %include "gr_constellation_decoder_cb.i"
-%include "gr_constellation_decoder2_cb.i"
 %include "gr_binary_slicer_fb.i"
 %include "gr_diff_encoder_bb.i"
 %include "gr_diff_decoder_bb.i"
diff --git a/gnuradio-core/src/lib/general/gr_constellation_receiver_cb.cc b/gnuradio-core/src/lib/general/gr_constellation_receiver_cb.cc
index c1b56f44f..be6d3bfe4 100644
--- a/gnuradio-core/src/lib/general/gr_constellation_receiver_cb.cc
+++ b/gnuradio-core/src/lib/general/gr_constellation_receiver_cb.cc
@@ -26,7 +26,6 @@
 
 #include <gr_io_signature.h>
 #include <gr_prefs.h>
-#include <gr_constellation.h>
 #include <gr_constellation_receiver_cb.h>
 #include <stdexcept>
 #include <gr_math.h>
diff --git a/gnuradio-core/src/lib/general/gr_constellation_receiver_cb.h b/gnuradio-core/src/lib/general/gr_constellation_receiver_cb.h
index 80ffcc873..c5670e839 100644
--- a/gnuradio-core/src/lib/general/gr_constellation_receiver_cb.h
+++ b/gnuradio-core/src/lib/general/gr_constellation_receiver_cb.h
@@ -24,7 +24,7 @@
 #define	INCLUDED_GR_CONSTELLATION_RECEIVER_CB_H
 
 #include <gr_block.h>
-#include <gr_constellation.h>
+#include <digital_constellation.h>
 #include <gr_complex.h>
 #include <math.h>
 #include <fstream>