Revert "Fixes for ABI compliance checker"

This reverts commit 578fcb99217bdbc4501e620ade7665242f793c71.
author: Johnathan Corgan <johnathan@corganlabs.com> 2015-12-11 19:34:19 -0800
committer: Johnathan Corgan <johnathan@corganlabs.com> 2015-12-11 19:34:19 -0800
commit: 066a32c6c3fad637541101839101d942eb0483c2 (patch)
tree: fe786fb7fa4016b795550644b7643952058ae6e1
parent: 4a8f168ad76e9e56cb8cb1f2f74dfb0112e44fe9 (diff)
8 files changed, 37 insertions, 16 deletions
diff --git a/gnuradio-runtime/include/gnuradio/py_feval.h b/gnuradio-runtime/include/gnuradio/py_feval.h
index 89491af0b4..cef168c8f0 100644
--- a/gnuradio-runtime/include/gnuradio/py_feval.h
+++ b/gnuradio-runtime/include/gnuradio/py_feval.h
@@ -23,7 +23,6 @@
 #ifndef INCLUDED_GR_PY_FEVAL_H
 #define INCLUDED_GR_PY_FEVAL_H
 
-#include <Python.h>
 #include <pmt/pmt.h>
 #include <gnuradio/feval.h>
 
diff --git a/gnuradio-runtime/include/gnuradio/sys_pri.h b/gnuradio-runtime/include/gnuradio/sys_pri.h
index d251455a11..adceb91b9d 100644
--- a/gnuradio-runtime/include/gnuradio/sys_pri.h
+++ b/gnuradio-runtime/include/gnuradio/sys_pri.h
@@ -23,7 +23,7 @@
 #define INCLUDED_GNURADIO_SYS_PRI_H
 
 #include <gnuradio/api.h>
-#include <gnuradio/realtime.h>
+#include <realtime.h>
 
 /*
  * A single place to define real-time priorities used by the system itself
@@ -31,10 +31,10 @@
 namespace gr {
 
   struct GR_RUNTIME_API sys_pri {
-    static struct GR_RUNTIME_API rt_sched_param python();		  // python code
-    static struct GR_RUNTIME_API rt_sched_param normal();		  // normal blocks
-    static struct GR_RUNTIME_API rt_sched_param gcell_event_handler();
-    static struct GR_RUNTIME_API rt_sched_param usrp2_backend();	  // thread that services the ethernet
+    static rt_sched_param python();		  // python code
+    static rt_sched_param normal();		  // normal blocks
+    static rt_sched_param gcell_event_handler();
+    static rt_sched_param usrp2_backend();	  // thread that services the ethernet
   };
 
 } /* namespace gr */
diff --git a/gr-atsc/include/gnuradio/atsc/CMakeLists.txt b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
index 3955a628b6..cdf818aab2 100644
--- a/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
+++ b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
@@ -41,6 +41,7 @@ install(FILES
     equalizer_lms2_impl.h
     equalizer_lms_impl.h
     equalizer_nop_impl.h
+    exp2_lp_impl.h
     fake_single_viterbi_impl.h
     field_sync_demux.h
     field_sync_mux.h
@@ -50,6 +51,29 @@ install(FILES
     fs_checker_naive_impl.h
     fs_correlator_impl.h
     fs_correlator_naive_impl.h
+    GrAtscBitTimingLoop2.h
+    GrAtscBitTimingLoop3.h
+    GrAtscBitTimingLoop.h
+    GrAtscConvert2xTo20.h
+    GrAtscDataSegToSoftDataSeg.h
+    GrAtscDeinterleaver.h
+    GrAtscDerandomizer.h
+    GrAtscEqualizer.h
+    GrAtscFieldSyncChecker.h
+    GrAtscFieldSyncCorrelator.h
+    GrAtscFieldSyncDemux.h
+    GrAtscFieldSyncMux.h
+    GrAtscFPLL.h
+    GrAtscInterleaver.h
+    GrAtscRandomizer.h
+    GrAtscRSDecoder.h
+    GrAtscRSEncoder.h
+    GrAtscSegSymSync.h
+    GrAtscSegSymSyncImpl_export.h
+    GrAtscSegSymSyncImpl.h
+    GrAtscSymbolMapper.h
+    GrAtscTrellisEncoder.h
+    GrAtscViterbiDecoder.h
     interleaver_fifo.h
     interleaver.h
     pad.h
@@ -57,9 +81,12 @@ install(FILES
     randomizer.h
     randomizer_impl.h
     reed_solomon_impl.h
+    root_raised_cosine_bandpass_impl.h
+    root_raised_cosine_impl.h
     rs_decoder.h
     rs_encoder.h
     single_viterbi_impl.h
+    slicer_agc_impl.h
     sliding_correlator_impl.h
     sssr_impl.h
     syminfo_impl.h
@@ -69,6 +96,7 @@ install(FILES
     types.h
     viterbi_decoder.h
     viterbi_decoder_impl.h
+    vsbtx_lp_impl.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/atsc
     COMPONENT "atsc_devel"
 )
diff --git a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
index 29022b63bf..1e0c9f35f2 100644
--- a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
+++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
@@ -45,6 +45,8 @@ install(FILES
   qtgui_types.h
   sink_c.h
   sink_f.h
+  spectrumdisplayform.h
+  SpectrumGUIClass.h
   spectrumUpdateEvents.h
   timedisplayform.h
   timecontrolpanel.h
diff --git a/gr-vocoder/gnuradio-vocoder.pc.in b/gr-vocoder/gnuradio-vocoder.pc.in
index f9373196cc..c5c860dc62 100644
--- a/gr-vocoder/gnuradio-vocoder.pc.in
+++ b/gr-vocoder/gnuradio-vocoder.pc.in
@@ -8,4 +8,4 @@ Description: GNU Radio blocks implementing voice codecs
 Requires: gnuradio-runtime
 Version: @LIBVER@
 Libs: -L${libdir} -lgnuradio-vocoder
-Cflags: -I${includedir} @EMBEDDED_CODEC2_INCLUDE@
+Cflags: -I${includedir}
diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2.h b/gr-vocoder/include/gnuradio/vocoder/codec2.h
index 871903fb22..a3c2225208 100644
--- a/gr-vocoder/include/gnuradio/vocoder/codec2.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2.h
@@ -26,7 +26,7 @@
 #include <gnuradio/vocoder/api.h>
 
 extern "C" {
-#include <codec2/codec2.h>
+#include "../lib/codec2/codec2.h"
 }
 
 namespace gr {
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index 7e813de9a9..a347cbf7fe 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -140,9 +140,6 @@ else (NOT DEFINED GR_USE_SYSTEM_LIBCODEC2)
  else (GR_USE_SYSTEM_LIBCODEC2)
     set(GR_USE_LOCAL_LIBCODEC2 TRUE)
     message(STATUS "Using gnuradio local copy of libcodec2.")
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-    set(EMBEDDED_CODEC2_INCLUDE "-I\${includedir}/gnuradio/vocoder" PARENT_SCOPE)
-    set(EMBEDDED_CODEC2_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/gr-vocoder/lib PARENT_SCOPE)
  endif (GR_USE_SYSTEM_LIBCODEC2)
 endif (NOT DEFINED GR_USE_SYSTEM_LIBCODEC2)
 
@@ -154,7 +151,6 @@ mark_as_advanced(LIBCODEC2_INCLUDE_DIR LIBCODEC2_LIBRARIES)
 ########################################################################
 include_directories(
     ${GR_VOCODER_INCLUDE_DIRS}
-    ${EMBEDDED_CODEC2_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -214,9 +210,6 @@ GR_INCLUDE_SUBDIRECTORY(g7xx)
 
 if(GR_USE_LOCAL_LIBCODEC2)
  GR_INCLUDE_SUBDIRECTORY(codec2)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/codec2/codec2.h
-   DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder/codec2/
-   COMPONENT "vocoder_devel")
 endif(GR_USE_LOCAL_LIBCODEC2)
 
 if(GR_USE_LOCAL_LIBGSM)
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
index 4e15442c59..26623969a7 100644
--- a/gr-vocoder/swig/CMakeLists.txt
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -25,7 +25,6 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_VOCODER_INCLUDE_DIRS}
-    ${EMBEDDED_CODEC2_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
author	Johnathan Corgan <johnathan@corganlabs.com>	2015-12-11 19:34:19 -0800
committer	Johnathan Corgan <johnathan@corganlabs.com>	2015-12-11 19:34:19 -0800
commit	066a32c6c3fad637541101839101d942eb0483c2 (patch)
tree	fe786fb7fa4016b795550644b7643952058ae6e1
parent	4a8f168ad76e9e56cb8cb1f2f74dfb0112e44fe9 (diff)