diff options
| author | Tom Rondeau | 2011-04-08 15:37:29 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-08 15:37:29 -0400 |
| commit | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch) | |
| tree | 4e72909a051b0a4ac428252d15f34b53bcc986b6 /gr-qtgui/src/python/Makefile.am | |
| parent | d7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff) | |
| parent | 5c358afd00347f5da7a59dd73ea79cd3df26659d (diff) | |
| download | gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.gz gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.bz2 gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.zip | |
Merge branch 'master' into constell_obj
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gr-audio-oss/src/Makefile.swig.gen
gr-audio/swig/Makefile.swig.gen
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 |