diff options
| author | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
| commit | cbf76b863bfd62ca22913b84bc705908a817b664 (patch) | |
| tree | 3a2692c067a60487b965201f1ed4a92ca26f0816 /gr-qtgui/src/python/Makefile.am | |
| parent | 918d53d764736fe2be79e1a6e08aba7d2e75f56d (diff) | |
| parent | 6c3623b0b084ce9328557ebd3cd487c484ee1c5b (diff) | |
| download | gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.gz gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.bz2 gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.zip | |
Merge branch '8psk' of github.com:trondeau/gnuradio into 8psk
Conflicts:
gr-digital/lib/digital_costas_loop_cc.cc
gr-digital/python/qa_costas_loop_cc.py
Diffstat (limited to 'gr-qtgui/src/python/Makefile.am')
| -rw-r--r-- | gr-qtgui/src/python/Makefile.am | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/gr-qtgui/src/python/Makefile.am b/gr-qtgui/src/python/Makefile.am index 31df63a44..0953a71e5 100644 --- a/gr-qtgui/src/python/Makefile.am +++ b/gr-qtgui/src/python/Makefile.am @@ -21,18 +21,25 @@ include $(top_srcdir)/Makefile.common +TESTS = +EXTRA_DIST += run_tests.in \ + qt_digital_window.ui + +if PYTHON +TESTS += run_tests +DISTCLEANFILES += run_tests + +qtguipythondir = $(grpythondir)/qtgui + noinst_PYTHON = \ pyqt_example_f.py \ pyqt_example.py \ qt_digital.py \ qt_digital_window.py \ usrp2_display.py \ - usrp_display.py - -EXTRA_DIST += \ - qt_digital_window.ui - -qtguipythondir = $(grpythondir)/qtgui + usrp_display.py \ + qa_qtgui.py -qtguipython_PYTHON = \ +qtguipython_PYTHON = \ __init__.py +endif |