diff options
| -rw-r--r-- | config/grc_gr_qtgui.m4 | 1 | ||||
| -rw-r--r-- | gr-qtgui/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-qtgui/apps/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-qtgui/examples/.gitignore | 2 | ||||
| -rw-r--r-- | gr-qtgui/examples/Makefile.am | 34 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_example_c.py (renamed from gr-qtgui/apps/pyqt_example_c.py) | 0 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_example_f.py (renamed from gr-qtgui/apps/pyqt_example_f.py) | 0 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_time_c.py (renamed from gr-qtgui/apps/pyqt_time_c.py) | 0 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_time_f.py (renamed from gr-qtgui/apps/pyqt_time_f.py) | 0 |
9 files changed, 38 insertions, 4 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index ddb7c7ca9..2204e49ae 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -83,6 +83,7 @@ AC_DEFUN([GRC_GR_QTGUI],[ gr-qtgui/Makefile \ gr-qtgui/gnuradio-qtgui.pc \ gr-qtgui/apps/Makefile \ + gr-qtgui/examples/Makefile \ gr-qtgui/grc/Makefile \ gr-qtgui/lib/Makefile \ gr-qtgui/python/Makefile \ diff --git a/gr-qtgui/Makefile.am b/gr-qtgui/Makefile.am index cc194e4c0..38033e1ac 100644 --- a/gr-qtgui/Makefile.am +++ b/gr-qtgui/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common SUBDIRS = lib if PYTHON -SUBDIRS += swig python apps grc +SUBDIRS += swig python apps grc examples endif pkgconfigdir = $(libdir)/pkgconfig diff --git a/gr-qtgui/apps/Makefile.am b/gr-qtgui/apps/Makefile.am index 7b35d949e..31450d15c 100644 --- a/gr-qtgui/apps/Makefile.am +++ b/gr-qtgui/apps/Makefile.am @@ -28,9 +28,6 @@ nodist_bin_SCRIPTS = \ usrp_display_qtgui.ui noinst_PYTHON = \ - pyqt_example_f.py \ - pyqt_example_c.py \ - pyqt_time_c.py \ qt_digital.py \ qt_digital_window.py \ usrp2_display.py \ diff --git a/gr-qtgui/examples/.gitignore b/gr-qtgui/examples/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-qtgui/examples/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-qtgui/examples/Makefile.am b/gr-qtgui/examples/Makefile.am new file mode 100644 index 000000000..a204d1fcc --- /dev/null +++ b/gr-qtgui/examples/Makefile.am @@ -0,0 +1,34 @@ +# +# Copyright 2008-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 $(top_srcdir)/Makefile.common + +if PYTHON +ourdatadir = $(exampledir)/qt-gui + +dist_ourdata_SCRIPTS = \ + pyqt_example_c.py \ + pyqt_example_f.py \ + pyqt_time_c.py \ + pyqt_time_f.py +endif + +EXTRA_DIST += diff --git a/gr-qtgui/apps/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py index 607ab12ee..607ab12ee 100755 --- a/gr-qtgui/apps/pyqt_example_c.py +++ b/gr-qtgui/examples/pyqt_example_c.py diff --git a/gr-qtgui/apps/pyqt_example_f.py b/gr-qtgui/examples/pyqt_example_f.py index 2d957c85a..2d957c85a 100755 --- a/gr-qtgui/apps/pyqt_example_f.py +++ b/gr-qtgui/examples/pyqt_example_f.py diff --git a/gr-qtgui/apps/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py index fa7d60e81..fa7d60e81 100755 --- a/gr-qtgui/apps/pyqt_time_c.py +++ b/gr-qtgui/examples/pyqt_time_c.py diff --git a/gr-qtgui/apps/pyqt_time_f.py b/gr-qtgui/examples/pyqt_time_f.py index 1b9efa10d..1b9efa10d 100755 --- a/gr-qtgui/apps/pyqt_time_f.py +++ b/gr-qtgui/examples/pyqt_time_f.py |