Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid

Conflicts:
	volk/Makefile.common
	volk/lib/qa_utils.cc

1 files changed, 38 insertions, 0 deletions

diff --git a/gr-qtgui/python/Makefile.am b/gr-qtgui/python/Makefile.am
new file mode 100644
index 000000000..f1bdf359b
--- /dev/null
+++ b/gr-qtgui/python/Makefile.am
@@ -0,0 +1,38 @@
+#
+# Copyright 2008,2009 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
+
+TESTS = 
+EXTRA_DIST += run_tests.in
+
+if PYTHON
+TESTS += run_tests
+DISTCLEANFILES += run_tests
+
+qtguipythondir = $(grpythondir)/qtgui
+
+noinst_PYTHON = 		\
+	qa_qtgui.py
+
+qtguipython_PYTHON =		\
+	__init__.py
+endif