examples: making both autotools and cmake install all the same examples.

12 files changed, 279 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b1bc0636..a6543e9e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,6 +218,8 @@ add_subdirectory(gr-utils)
 add_subdirectory(gr-video-sdl)
 add_subdirectory(gr-vocoder)
 add_subdirectory(gr-wxgui)
+add_subdirectory(gnuradio-examples/grc)
+add_subdirectory(gnuradio-examples/python)
 
 #finalize cpack after subdirs processed
 include(GrPackage)
diff --git a/gnuradio-examples/grc/CMakeLists.txt b/gnuradio-examples/grc/CMakeLists.txt
new file mode 100644
index 000000000..75f10d86a
--- /dev/null
+++ b/gnuradio-examples/grc/CMakeLists.txt
@@ -0,0 +1,86 @@
+# 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,
+# Boston, MA 02110-1301, USA.
+
+# AUDIO
+install(
+    FILES
+    audio/cvsd_sweep.grc
+    audio/dial_tone.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/audio
+    COMPONENT "gnuadio-examples"
+)
+
+# DEMOD
+install(
+    FILES
+    demod/digital_freq_lock.grc
+    demod/mpsk_demod.grc
+    demod/pam_sync.grc
+    demod/pam_timing.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/demod
+    COMPONENT "gnuadio-examples"
+)
+
+# SIMPLE
+install(
+    FILES
+    simple/ber_simulation.grc
+    simple/dpsk_loopback.grc
+    simple/variable_config.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/simple
+    COMPONENT "gnuadio-examples"
+)
+
+# TRELLIS
+install(
+    FILES
+    trellis/interference_cancellation.grc
+    trellis/pccc1.grc
+    trellis/pccc.grc
+    trellis/sccc1.grc
+    trellis/sccc.grc
+    trellis/readme.txt
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/trellis
+    COMPONENT "gnuadio-examples"
+)
+
+# UHD
+install(
+    FILES
+    uhd/uhd_const_wave.grc
+    uhd/uhd_dpsk_mod.grc
+    uhd/uhd_fft.grc
+    uhd/uhd_rx_dpsk.grc
+    uhd/uhd_two_tone_loopback.grc
+    uhd/uhd_tx_dpsk.grc
+    uhd/uhd_wbfm_receive.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/uhd
+    COMPONENT "gnuadio-examples"
+)
+
+# XMLRPC
+install(
+    FILES
+    xmlrpc/readme.txt
+    xmlrpc/xmlrpc_client.grc
+    xmlrpc/xmlrpc_client_script.py
+    xmlrpc/xmlrpc_server.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/xmlrpc
+    COMPONENT "gnuadio-examples"
+)
diff --git a/gnuradio-examples/grc/Makefile.am b/gnuradio-examples/grc/Makefile.am
index e99d26299..f8906ea67 100644
--- a/gnuradio-examples/grc/Makefile.am
+++ b/gnuradio-examples/grc/Makefile.am
@@ -44,7 +44,11 @@ dist_simpledata_DATA = \
 trellisdatadir = $(grc_examples_prefix)/trellis
 dist_trellisdata_DATA = \
 	trellis/readme.txt \
-	trellis/interference_cancellation.grc
+	trellis/interference_cancellation.grc \
+	trellis/pccc.grc \
+	trellis/pccc1.grc \
+	trellis/sccc.grc \
+	trellis/sccc1.grc
 
 uhddatadir = $(grc_examples_prefix)/uhd
 dist_uhddata_DATA = \
diff --git a/gnuradio-examples/python/CMakeLists.txt b/gnuradio-examples/python/CMakeLists.txt
new file mode 100644
index 000000000..39b1fe806
--- /dev/null
+++ b/gnuradio-examples/python/CMakeLists.txt
@@ -0,0 +1,23 @@
+# 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,
+# Boston, MA 02110-1301, USA.
+
+add_subdirectory(mp-sched)
+add_subdirectory(network)
+add_subdirectory(pfb)
+add_subdirectory(tags)
\ No newline at end of file
diff --git a/gnuradio-examples/python/mp-sched/CMakeLists.txt b/gnuradio-examples/python/mp-sched/CMakeLists.txt
new file mode 100644
index 000000000..ca090659d
--- /dev/null
+++ b/gnuradio-examples/python/mp-sched/CMakeLists.txt
@@ -0,0 +1,35 @@
+# 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,
+# Boston, MA 02110-1301, USA.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  plot_flops.py
+  run_synthetic.py
+  synthetic.py
+  wfm_rcv_pll_to_wav.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
+  COMPONENT "gnuradio_examples"
+)
+
+install(
+    FILES README
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
+    COMPONENT "gnuadio-examples"
+)
diff --git a/gnuradio-examples/python/network/CMakeLists.txt b/gnuradio-examples/python/network/CMakeLists.txt
new file mode 100644
index 000000000..e70403ba0
--- /dev/null
+++ b/gnuradio-examples/python/network/CMakeLists.txt
@@ -0,0 +1,30 @@
+# 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,
+# Boston, MA 02110-1301, USA.
+
+GR_PYTHON_INSTALL(PROGRAMS
+  audio_sink.py
+  audio_source.py
+  dial_tone_sink.py
+  dial_tone_source.py
+  vector_sink.py
+  vector_source.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/network
+  COMPONENT "gnuradio_examples"
+)
+
diff --git a/gnuradio-examples/python/pfb/CMakeLists.txt b/gnuradio-examples/python/pfb/CMakeLists.txt
new file mode 100644
index 000000000..55dbb16ac
--- /dev/null
+++ b/gnuradio-examples/python/pfb/CMakeLists.txt
@@ -0,0 +1,35 @@
+# 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,
+# Boston, MA 02110-1301, USA.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  channelize.py
+  chirp_channelize.py
+  decimate.py
+  fmtest.py
+  interpolate.py
+  resampler_demo.grc
+  resampler.py
+  synth_filter.py
+  synth_to_chan.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/pfb
+  COMPONENT "gnuradio_examples"
+)
+
diff --git a/gnuradio-examples/python/pfb/Makefile.am b/gnuradio-examples/python/pfb/Makefile.am
index 0b91d0a2d..39c81bfc2 100644
--- a/gnuradio-examples/python/pfb/Makefile.am
+++ b/gnuradio-examples/python/pfb/Makefile.am
@@ -28,7 +28,10 @@ dist_ourdata_SCRIPTS =		\
 	chirp_channelize.py	\
 	decimate.py		\
 	interpolate.py		\
-	fmtest.py
+	fmtest.py		\
+	resampler.py		\
+	synth_filter.py		\
+	synth_to_chan.py
 
 dist_ourdata_DATA =		\
 	resampler_demo.grc
diff --git a/gnuradio-examples/python/tags/CMakeLists.txt b/gnuradio-examples/python/tags/CMakeLists.txt
new file mode 100644
index 000000000..d2cd7b793
--- /dev/null
+++ b/gnuradio-examples/python/tags/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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,
+# Boston, MA 02110-1301, USA.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  test_file_tags.py
+  uhd_burst_detector.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/tags
+  COMPONENT "gnuradio_examples"
+)
+
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
index 6a9c39f9d..3e870eee9 100644
--- a/gr-qtgui/CMakeLists.txt
+++ b/gr-qtgui/CMakeLists.txt
@@ -107,6 +107,7 @@ if(ENABLE_PYTHON)
     add_subdirectory(grc)
     add_subdirectory(swig)
     add_subdirectory(python)
+    add_subdirectory(examples)
 endif(ENABLE_PYTHON)
 
 ########################################################################
diff --git a/gr-qtgui/examples/CMakeLists.txt b/gr-qtgui/examples/CMakeLists.txt
new file mode 100644
index 000000000..30fdc5e75
--- /dev/null
+++ b/gr-qtgui/examples/CMakeLists.txt
@@ -0,0 +1,29 @@
+# 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,
+# Boston, MA 02110-1301, USA.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  pyqt_example_c.py
+  pyqt_example_f.py
+  pyqt_time_c.py
+  pyqt_time_f.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/qt-gui
+  COMPONENT "gnuradio_examples"
+)
diff --git a/gr-uhd/apps/CMakeLists.txt b/gr-uhd/apps/CMakeLists.txt
index 36bee13e0..20ae8993f 100644
--- a/gr-uhd/apps/CMakeLists.txt
+++ b/gr-uhd/apps/CMakeLists.txt
@@ -47,7 +47,7 @@ install(
 )
 
 GR_PYTHON_INSTALL(
-    FILES
+    PROGRAMS
     hf_radio/input.py
     hf_radio/output.py
     hf_radio/ssbagc.py