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

Conflicts:
	gr-digital/include/digital_constellation.h

8 files changed, 14 insertions, 155 deletions

diff --git a/config/Makefile.am b/config/Makefile.am
index 3eaa5e748..d2cb02865 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -46,14 +46,12 @@ m4macros = \
 	cppunit.m4 \
 	grc_build.m4 \
 	grc_docs.m4 \
-	grc_gcell.m4 \
 	grc_gnuradio_core.m4 \
 	grc_gnuradio_examples.m4 \
 	grc_grc.m4 \
 	grc_gr_atsc.m4 \
 	grc_gr_audio.m4 \
 	grc_gr_comedi.m4 \
-	grc_gr_gcell.m4 \
 	grc_gr_noaa.m4 \
 	grc_gr_radio_astronomy.m4 \
 	grc_gr_trellis.m4 \
@@ -70,7 +68,6 @@ m4macros = \
 	grc_usrp2.m4 \
 	gr_doxygen.m4 \
 	gr_fortran.m4 \
-	gr_gcell.m4 \
 	gr_git.m4 \
 	gr_gprof.m4 \
 	gr_lib64.m4 \
diff --git a/config/gr_gcell.m4 b/config/gr_gcell.m4
deleted file mode 100644
index 0b8b97802..000000000
--- a/config/gr_gcell.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-AC_DEFUN([GR_GCELL],[
-  passed=yes
-  PKG_CHECK_MODULES(GCELL, gcell >= 3.1, [],
-    [passed=no; AC_MSG_RESULT([gcell not found])])
-  PKG_CHECK_MODULES(GCELL_SPU, gcell_spu >= 3.1, [],
-    [passed=no; AC_MSG_RESULT([gcell_spu not found])])
-
-  GCELL_EMBEDSPU_LIBTOOL=
-  if test $passed = yes; then
-    GCELL_EMBEDSPU_LIBTOOL=`$PKG_CONFIG --variable=gcell_embedspu_libtool gcell 2>/dev/null`
-    AC_DEFINE(HAVE_GCELL,[1],[Define if you have gcell installed])
-  fi
-  AC_SUBST([GCELL_EMBEDSPU_LIBTOOL])
-
-  AM_CONDITIONAL([HAVE_GCELL], [test "$passed" = "yes"])
-])
diff --git a/config/grc_gcell.m4 b/config/grc_gcell.m4
deleted file mode 100644
index b94deb4db..000000000
--- a/config/grc_gcell.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GCELL],[
-    GRC_ENABLE(gcell)
-    dnl GRC_WITH(gcell)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-	dnl Don't build gcell if host_cpu isn't powerpc
-	AC_MSG_CHECKING([whether host_cpu is powerpc*])
-	case "$host_cpu" in
-	    powerpc*)
-		AC_MSG_RESULT(yes)
-	        ;;
-            *)
-	        passed=no
-		AC_MSG_RESULT(no)
-		;;
-	esac
-
-        dnl Don't build gcell if we can't find spu-gcc.
-	AC_CHECK_PROG([SPU_GCC_PROG],[spu-gcc],[yes],[no])
-	if test $SPU_GCC_PROG = no; then
-            passed=no
-        fi
-    fi
-
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA
-	gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/include"
-        gcell_LA="\${abs_top_builddir}/gcell/lib/libgcell.la"
-	gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/include"
-	gcell_spu_LA="\${abs_top_builddir}/gcell/lib/spu/libgcell_spu.a"
-	AC_SUBST(gcell_spu_INCLUDES)
-	AC_SUBST(gcell_spu_LA)
-
-    fi
-
-    AC_CONFIG_FILES([ \
-        gcell/Makefile \
-        gcell/gcell.pc \
-        gcell/gcell_spu.pc \
-	gcell/include/Makefile \
-        gcell/include/gcell/Makefile \
-        gcell/include/gcell/spu/Makefile \
-        gcell/lib/Makefile \
-        gcell/lib/spu/Makefile \
-        gcell/lib/general/Makefile \
-        gcell/lib/wrapper/Makefile \
-        gcell/lib/runtime/Makefile \
-        gcell/apps/Makefile \
-	gcell/apps/spu/Makefile \
-	gcell/ibm/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gcell)
-])
diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4
index 92a0440d0..0e881671a 100644
--- a/config/grc_gr_audio.m4
+++ b/config/grc_gr_audio.m4
@@ -108,6 +108,7 @@ AC_DEFUN([GRC_GR_AUDIO],[
         gr-audio/include/Makefile \
         gr-audio/lib/Makefile \
         gr-audio/swig/Makefile \
+	gr-audio/doc/Makefile \
         gr-audio/gnuradio-audio.pc \
     ])
 
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4
index 35fafa0dd..9beb59d4b 100644
--- a/config/grc_gr_digital.m4
+++ b/config/grc_gr_digital.m4
@@ -28,7 +28,7 @@ AC_DEFUN([GRC_GR_DIGITAL],[
         gr_digital_INCLUDES="\
 -I\${abs_top_srcdir}/gr-digital/include \
 -I\${abs_top_srcdir}/gr-digital/swig"
-        gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-core.la"
+        gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-digital.la"
 	gr_digital_LIBDIRPATH="\${abs_top_builddir}/gr-digital/lib:\${abs_top_builddir}/gr-digital/lib/.libs"
 	gr_digital_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-digital/swig/.libs:\${abs_top_srcdir}/gr-digital/swig"
 	gr_digital_PYDIRPATH="\${abs_top_srcdir}/gr-digital/python"
@@ -51,6 +51,7 @@ AC_DEFUN([GRC_GR_DIGITAL],[
 	gr-digital/swig/Makefile \
 	gr-digital/swig/run_guile_tests \
 	gr-digital/examples/Makefile \
+	gr-digital/doc/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-digital,[
diff --git a/config/grc_gr_gcell.m4 b/config/grc_gr_gcell.m4
deleted file mode 100644
index 476de364f..000000000
--- a/config/grc_gr_gcell.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_GCELL],[
-    GRC_ENABLE(gr-gcell)
-
-    dnl Don't do gr-gcell if gcell or gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-gcell, gcell)
-    GRC_CHECK_DEPENDENCY(gr-gcell, gnuradio-core)
-
-    AC_CONFIG_FILES([ \
-        gr-gcell/Makefile \
-        gr-gcell/src/Makefile \
-        gr-gcell/src/examples/Makefile \
-        gr-gcell/src/run_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-gcell,[
-	dnl run_tests is created from run_tests.in.  Make it executable.
-	AC_CONFIG_COMMANDS([run_tests_gcell], [chmod +x gr-gcell/src/run_tests])
-    ])
-])
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 2204e49ae..6da61df2b 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -72,6 +72,14 @@ AC_DEFUN([GRC_GR_QTGUI],[
 	QT_MOC_EXEC=`pkg-config --variable=moc_location QtCore`
 	QT_UIC_EXEC=`pkg-config --variable=uic_location QtCore`
 
+        gr_qtgui_INCLUDES="\
+-I\${abs_top_srcdir}/gr-qtgui/include \
+-I\${abs_top_srcdir}/gr-qtgui/swig"
+        gr_qtgui_LA="\${abs_top_builddir}/gr-qtgui/lib/libgnuradio-qtgui.la"
+	gr_qtgui_LIBDIRPATH="\${abs_top_builddir}/gr-qtgui/lib:\${abs_top_builddir}/gr-qtgui/lib/.libs"
+	gr_qtgui_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-qtgui/swig/.libs:\${abs_top_srcdir}/gr-qtgui/swig"
+	gr_qtgui_PYDIRPATH="\${abs_top_srcdir}/gr-qtgui/python"
+
         AC_SUBST(QMAKE_INCLUDES)
         AC_SUBST(QT_INCLUDES)
 	AC_SUBST(QT_LIBS)
@@ -85,10 +93,12 @@ AC_DEFUN([GRC_GR_QTGUI],[
         gr-qtgui/apps/Makefile \
         gr-qtgui/examples/Makefile \
         gr-qtgui/grc/Makefile \
+	gr-qtgui/include/Makefile \
         gr-qtgui/lib/Makefile \
         gr-qtgui/python/Makefile \
         gr-qtgui/python/run_tests \
         gr-qtgui/swig/Makefile \
+	gr-qtgui/doc/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-qtgui,[
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
index f2170166b..0da087c48 100644
--- a/config/grc_gr_uhd.m4
+++ b/config/grc_gr_uhd.m4
@@ -53,6 +53,7 @@ AC_DEFUN([GRC_GR_UHD],[
         gr-uhd/apps/hf_radio/Makefile \
 	gr-uhd/examples/Makefile \
 	gr-uhd/examples/multi-antenna/Makefile \
+	gr-uhd/doc/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-uhd,[