gr: updated cmakelists after merge for additional files

7 files changed, 113 insertions, 14 deletions

diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt
index 551715467..4c6fcf642 100644
--- a/gnuradio-core/src/lib/filter/CMakeLists.txt
+++ b/gnuradio-core/src/lib/filter/CMakeLists.txt
@@ -337,6 +337,7 @@ SET(gr_core_filter_triple_threats
     gr_pfb_decimator_ccf
     gr_pfb_interpolator_ccf
     gr_pfb_arb_resampler_ccf
+    gr_pfb_arb_resampler_fff
     gr_pfb_clock_sync_ccf
     gr_pfb_clock_sync_fff
 )
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h
index 541df8aa4..bf55c312b 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h
@@ -24,11 +24,12 @@
 #ifndef INCLUDED_GR_PFB_ARB_RESAMPLER_FFF_H
 #define	INCLUDED_GR_PFB_ARB_RESAMPLER_FFF_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gr_pfb_arb_resampler_fff;
 typedef boost::shared_ptr<gr_pfb_arb_resampler_fff> gr_pfb_arb_resampler_fff_sptr;
-gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float rate,
+GR_CORE_API gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float rate,
 							     const std::vector<float> &taps,
 							     unsigned int filter_size=32);
 
@@ -95,7 +96,7 @@ class gr_fir_fff;
  *       Systems", Upper Saddle River, NJ: Prentice Hall, Inc. 2004.</EM></B>
  */
 
-class gr_pfb_arb_resampler_fff : public gr_block
+class GR_CORE_API gr_pfb_arb_resampler_fff : public gr_block
 {
  private:
   /*!
@@ -107,7 +108,7 @@ class gr_pfb_arb_resampler_fff : public gr_block
                                        related to quantization noise introduced during the resampling.
 				       Defaults to 32 filters.
    */
-  friend gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float rate,
+  friend GR_CORE_API gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float rate,
 								      const std::vector<float> &taps,
 								      unsigned int filter_size);
 
diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt
index f494d0f1e..964596ae8 100644
--- a/gr-digital/examples/CMakeLists.txt
+++ b/gr-digital/examples/CMakeLists.txt
@@ -22,12 +22,16 @@ INCLUDE(GrPython)
 GR_PYTHON_INSTALL(PROGRAMS
     transmit_path.py
     receive_path.py
+    uhd_interface.py
     benchmark_tx.py
     benchmark_rx.py
     tx_voice.py
     rx_voice.py
     run_length.py
     gen_whitener.py
+    digital_bert_rx.py
+    digital_bert_tx.py
+    tunnel.py
     DESTINATION ${GR_PKG_DATA_DIR}/examples/digital
     COMPONENT "digital_python"
 )
diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt
index 2d09a4945..db4feb9af 100644
--- a/gr-digital/python/CMakeLists.txt
+++ b/gr-digital/python/CMakeLists.txt
@@ -30,7 +30,6 @@ GR_PYTHON_INSTALL(
     crc.py
     generic_mod_demod.py
     gmsk.py
-    modulation_utils.py
     modulation_utils2.py
     packet_utils.py
     pkt.py
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
index 307fba248..b1e6fd4e0 100644
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(GR_SWIG_LIBRARIES gnuradio-digital)
 GR_SWIG_MAKE(digital_swig digital_swig.i)
 
 GR_SWIG_INSTALL(
-    TARGETS digital_hier digital_swig
+    TARGETS digital_swig
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
     COMPONENT "digital_python"
 )
diff --git a/gr-uhd/apps/CMakeLists.txt b/gr-uhd/apps/CMakeLists.txt
index 33e3abe15..e17be1d9b 100644
--- a/gr-uhd/apps/CMakeLists.txt
+++ b/gr-uhd/apps/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2011 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,
@@ -19,8 +19,66 @@
 
 INCLUDE(GrPython)
 
+########################################################################
+# Install some uhd apps
+########################################################################
 GR_PYTHON_INSTALL(
-    PROGRAMS uhd_fft.py uhd_rx_cfile.py
+    PROGRAMS
+    uhd_fft.py
+    uhd_rx_cfile.py
+    uhd_siggen.py
+    uhd_siggen_gui.py
+    uhd_rx_nogui.py
     DESTINATION ${GR_RUNTIME_DIR}
     COMPONENT "uhd_python"
 )
+
+########################################################################
+# Install hf radio apps
+########################################################################
+INSTALL(
+    FILES
+    hf_radio/hfir.sci
+    hf_radio/radio.xml
+    hf_radio/README.TXT
+    hf_radio/ssb_taps
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
+    COMPONENT "uhd_python"
+)
+
+GR_PYTHON_INSTALL(
+    FILES
+    hf_radio/input.py
+    hf_radio/output.py
+    hf_radio/ssbagc.py
+    hf_radio/ssbdemod.py
+    hf_radio/startup.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
+    COMPONENT "uhd_python"
+)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    hf_radio/radio.py
+    hf_radio/ui.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
+    COMPONENT "uhd_python"
+)
+
+########################################################################
+# Install hf explorer
+########################################################################
+INSTALL(
+    FILES
+    hf_explorer/README
+    hf_explorer/hfx_help
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_explorer
+    COMPONENT "uhd_python"
+)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    hf_explorer/hfx.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_explorer
+    COMPONENT "uhd_python"
+)
diff --git a/gr-uhd/examples/CMakeLists.txt b/gr-uhd/examples/CMakeLists.txt
index 3e1c80362..f5890a484 100644
--- a/gr-uhd/examples/CMakeLists.txt
+++ b/gr-uhd/examples/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2011 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,
@@ -37,3 +37,39 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 ########################################################################
 ADD_EXECUTABLE(tags_demo tags_demo.cc)
 TARGET_LINK_LIBRARIES(tags_demo gnuradio-uhd)
+
+########################################################################
+# Python examples
+########################################################################
+IF(ENABLE_PYTHON)
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    fm_tx4.py
+    fm_tx_2_daughterboards.py
+    max_power.py
+    usrp_am_mw_rcv.py
+    usrp_nbfm_ptt.py
+    usrp_nbfm_rcv.py
+    usrp_spectrum_sense.py
+    usrp_tv_rcv_nogui.py
+    usrp_tv_rcv.py
+    usrp_wfm_rcv2_nogui.py
+    usrp_wfm_rcv_fmdet.py
+    usrp_wfm_rcv_nogui.py
+    usrp_wfm_rcv_pll.py
+    usrp_wfm_rcv.py
+    usrp_wfm_rcv_sca.py
+    usrp_wxapt_rcv.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/uhd
+    COMPONENT "uhd_python"
+)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    multi-antenna/multi_fft.py
+    multi-antenna/multi_file.py
+    multi-antenna/multi_scope.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/multi-antenna
+    COMPONENT "uhd_python"
+)
+ENDIF(ENABLE_PYTHON)