diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 9 | ||||
| -rw-r--r-- | config/gr_gcell.m4 | 36 | ||||
| -rw-r--r-- | config/grc_gcell.m4 | 77 | ||||
| -rw-r--r-- | config/grc_gnuradio_core.m4 | 6 | ||||
| -rw-r--r-- | config/grc_gnuradio_examples.m4 | 10 | ||||
| -rw-r--r-- | config/grc_gr_audio.m4 | 1 | ||||
| -rw-r--r-- | config/grc_gr_cvsd_vocoder.m4 | 39 | ||||
| -rw-r--r-- | config/grc_gr_digital.m4 | 63 | ||||
| -rw-r--r-- | config/grc_gr_gcell.m4 | 38 | ||||
| -rw-r--r-- | config/grc_gr_gpio.m4 | 38 | ||||
| -rw-r--r-- | config/grc_gr_gsm_fr_vocoder.m4 | 40 | ||||
| -rw-r--r-- | config/grc_gr_msdd6000.m4 | 38 | ||||
| -rw-r--r-- | config/grc_gr_qtgui.m4 | 11 | ||||
| -rw-r--r-- | config/grc_gr_radar_mono.m4 | 45 | ||||
| -rw-r--r-- | config/grc_gr_sounder.m4 | 44 | ||||
| -rw-r--r-- | config/grc_gr_trellis.m4 | 1 | ||||
| -rw-r--r-- | config/grc_gr_uhd.m4 | 5 | ||||
| -rw-r--r-- | config/grc_gr_vocoder.m4 | 49 |
18 files changed, 134 insertions, 416 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index ba3026cd9..d2cb02865 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -46,23 +46,18 @@ 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_gpio.m4 \ - grc_gr_gsm_fr_vocoder.m4 \ grc_gr_noaa.m4 \ - grc_gr_radar_mono.m4 \ grc_gr_radio_astronomy.m4 \ - grc_gr_sounder.m4 \ grc_gr_trellis.m4 \ grc_gr_usrp.m4 \ grc_gr_video_sdl.m4 \ + grc_gr_vocoder.m4 \ grc_gr_wxgui.m4 \ grc_gruel.m4 \ gr_check_createfilemapping.m4 \ @@ -71,10 +66,8 @@ m4macros = \ gr_check_usrp.m4 \ grc_usrp.m4 \ grc_usrp2.m4 \ - grc_gr_msdd6000.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_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 15086be0f..a35629e2e 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -86,7 +86,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/guile/gr-run-waveform-script \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ - gnuradio-core/src/lib/g72x/Makefile \ gnuradio-core/src/lib/general/Makefile \ gnuradio-core/src/lib/general/gr_constants.cc \ gnuradio-core/src/lib/gengen/Makefile \ @@ -106,7 +105,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/python/gnuradio/gr/run_tests \ gnuradio-core/src/python/gnuradio/gru/Makefile \ gnuradio-core/src/python/gnuradio/gruimpl/Makefile \ - gnuradio-core/src/python/gnuradio/vocoder/Makefile \ gnuradio-core/src/tests/Makefile \ gnuradio-core/src/utils/Makefile \ ]) @@ -117,6 +115,8 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ [ chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests chmod +x gnuradio-core/src/guile/run_guile_tests - ]) + ]) \ + AC_CONFIG_COMMANDS([run_tests_utils],[chmod +x gnuradio-core/src/python/gnuradio/utils/run_tests]) ]) + ]) diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 349ecd3d7..f6e964765 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -28,21 +28,11 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ gnuradio-examples/Makefile \ gnuradio-examples/python/Makefile \ gnuradio-examples/grc/Makefile \ - gnuradio-examples/python/apps/hf_explorer/Makefile \ - gnuradio-examples/python/apps/hf_radio/Makefile \ - gnuradio-examples/python/apps/Makefile \ - gnuradio-examples/python/digital/Makefile \ - gnuradio-examples/python/digital_voice/Makefile \ - gnuradio-examples/python/digital-bert/Makefile \ gnuradio-examples/python/mp-sched/Makefile \ - gnuradio-examples/python/multi-antenna/Makefile \ gnuradio-examples/python/multi_usrp/Makefile \ gnuradio-examples/python/network/Makefile \ - gnuradio-examples/python/ofdm/Makefile \ gnuradio-examples/python/pfb/Makefile \ gnuradio-examples/python/tags/Makefile \ - gnuradio-examples/python/usrp/Makefile \ - gnuradio-examples/python/usrp2/Makefile \ gnuradio-examples/waveforms/Makefile \ ]) 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_cvsd_vocoder.m4 b/config/grc_gr_cvsd_vocoder.m4 deleted file mode 100644 index ddf6f9b2f..000000000 --- a/config/grc_gr_cvsd_vocoder.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 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_CVSD_VOCODER],[ - GRC_ENABLE(gr-cvsd-vocoder) - - dnl Don't do gr-cvsd-vocoder if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-cvsd-vocoder, gnuradio-core) - - AC_CONFIG_FILES([\ - gr-cvsd-vocoder/Makefile \ - gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc \ - gr-cvsd-vocoder/src/Makefile \ - gr-cvsd-vocoder/src/lib/Makefile \ - gr-cvsd-vocoder/src/python/Makefile \ - gr-cvsd-vocoder/src/python/run_tests \ - ]) - - GRC_BUILD_CONDITIONAL(gr-cvsd-vocoder,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_cvsd], [chmod +x gr-cvsd-vocoder/src/python/run_tests]) - ]) -]) diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4 new file mode 100644 index 000000000..9beb59d4b --- /dev/null +++ b/config/grc_gr_digital.m4 @@ -0,0 +1,63 @@ +dnl Copyright 2011 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_DIGITAL],[ + GRC_ENABLE(gr-digital) + + dnl Don't do gr-digital if gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-digital, gnuradio-core) + + if test $passed != with; then + dnl how and where to find INCLUDES and LA and such + 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-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" + fi + + AC_SUBST(gr_digital_I) + AC_SUBST(gr_digital_SWIGDIRPATH) + AC_SUBST(gr_digital_PYDIRPATH) + + AC_CONFIG_FILES([\ + gr-digital/Makefile \ + gr-digital/gnuradio-digital.pc \ + gr-digital/apps/Makefile \ + gr-digital/grc/Makefile \ + gr-digital/include/Makefile \ + gr-digital/lib/Makefile \ + gr-digital/python/Makefile \ + gr-digital/python/run_tests \ + gr-digital/python/utils/Makefile \ + gr-digital/swig/Makefile \ + gr-digital/swig/run_guile_tests \ + gr-digital/examples/Makefile \ + gr-digital/doc/Makefile \ + ]) + + GRC_BUILD_CONDITIONAL(gr-digital,[ + dnl run_tests is created from run_tests.in. Make it executable. + AC_CONFIG_COMMANDS([run_tests_digital], + [chmod +x gr-digital/python/run_tests + chmod +x gr-digital/swig/run_guile_tests]) + ]) +]) 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_gpio.m4 b/config/grc_gr_gpio.m4 deleted file mode 100644 index 26c04b95c..000000000 --- a/config/grc_gr_gpio.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl Copyright 2007,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_GPIO],[ - GRC_ENABLE(gr-gpio) - - dnl Don't do gr-gpio if usrp skipped - GRC_CHECK_DEPENDENCY(gr-gpio, usrp) - - AC_CONFIG_FILES([ \ - gr-gpio/Makefile \ - gr-gpio/src/Makefile \ - gr-gpio/src/fpga/Makefile \ - gr-gpio/src/fpga/include/Makefile \ - gr-gpio/src/fpga/top/Makefile \ - gr-gpio/src/fpga/lib/Makefile \ - gr-gpio/src/fpga/rbf/Makefile \ - gr-gpio/src/python/Makefile - ]) - - GRC_BUILD_CONDITIONAL(gr-gpio) -]) diff --git a/config/grc_gr_gsm_fr_vocoder.m4 b/config/grc_gr_gsm_fr_vocoder.m4 deleted file mode 100644 index a93d4edb7..000000000 --- a/config/grc_gr_gsm_fr_vocoder.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 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_GSM_FR_VOCODER],[ - GRC_ENABLE(gr-gsm-fr-vocoder) - - dnl Don't do gr-gsm-fr-vocoder if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-gsm-fr-vocoder, gnuradio-core) - - AC_CONFIG_FILES([\ - gr-gsm-fr-vocoder/Makefile \ - gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc \ - gr-gsm-fr-vocoder/src/Makefile \ - gr-gsm-fr-vocoder/src/lib/Makefile \ - gr-gsm-fr-vocoder/src/lib/gsm/Makefile \ - gr-gsm-fr-vocoder/src/python/Makefile \ - gr-gsm-fr-vocoder/src/python/run_tests \ - ]) - - GRC_BUILD_CONDITIONAL(gr-gsm-fr-vocoder,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_gsm], [chmod +x gr-gsm-fr-vocoder/src/python/run_tests]) - ]) -]) diff --git a/config/grc_gr_msdd6000.m4 b/config/grc_gr_msdd6000.m4 deleted file mode 100644 index 0c6fc320e..000000000 --- a/config/grc_gr_msdd6000.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 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_MSDD6000],[ - GRC_ENABLE([gr-msdd6000]) - - AC_CONFIG_FILES([\ - gr-msdd6000/Makefile \ - gr-msdd6000/gnuradio-msdd6000.pc \ - gr-msdd6000/src/Makefile - ]) - - dnl Don't do gr-msdd6000 if gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-msdd6000, gnuradio-core) - - AC_CHECK_HEADERS(netinet/in.h arpa/inet.h sys/socket.h netdb.h, [], [passed=no]) - - GRC_BUILD_CONDITIONAL([gr-msdd6000],[ - dnl run_tests is created from run_tests.in. Make it executable. - dnl AC_CONFIG_COMMANDS([run_tests_msdd6000], [chmod +x gr-msdd6000/src/run_tests]) - ]) -]) diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index ddb7c7ca9..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) @@ -83,11 +91,14 @@ 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/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_radar_mono.m4 b/config/grc_gr_radar_mono.m4 deleted file mode 100644 index bf8e2dac4..000000000 --- a/config/grc_gr_radar_mono.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl Copyright 2007,2008 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_RADAR_MONO],[ - GRC_ENABLE(gr-radar-mono) - - dnl Don't do gr-radar-mono if usrp or gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-radar-mono, usrp) - GRC_CHECK_DEPENDENCY(gr-radar-mono, gnuradio-core) - - AC_CONFIG_FILES([ \ - gr-radar-mono/Makefile \ - gr-radar-mono/doc/Makefile \ - gr-radar-mono/src/Makefile \ - gr-radar-mono/src/fpga/Makefile \ - gr-radar-mono/src/fpga/top/Makefile \ - gr-radar-mono/src/fpga/lib/Makefile \ - gr-radar-mono/src/fpga/models/Makefile \ - gr-radar-mono/src/fpga/tb/Makefile \ - gr-radar-mono/src/lib/Makefile \ - gr-radar-mono/src/python/Makefile \ - gr-radar-mono/src/python/run_tests - ]) - - GRC_BUILD_CONDITIONAL(gr-radar-mono,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_radar_mono], [chmod +x gr-radar-mono/src/python/run_tests]) - ]) -]) diff --git a/config/grc_gr_sounder.m4 b/config/grc_gr_sounder.m4 deleted file mode 100644 index 672d13ab1..000000000 --- a/config/grc_gr_sounder.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl Copyright 2007,2008 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_SOUNDER],[ - GRC_ENABLE(gr-sounder) - - dnl Don't do gr-sounder if usrp or gnuradio-core skipped - GRC_CHECK_DEPENDENCY(gr-sounder, usrp) - GRC_CHECK_DEPENDENCY(gr-sounder, gnuradio-core) - - AC_CONFIG_FILES([ \ - gr-sounder/Makefile \ - gr-sounder/doc/Makefile \ - gr-sounder/src/Makefile \ - gr-sounder/src/fpga/Makefile \ - gr-sounder/src/fpga/top/Makefile \ - gr-sounder/src/fpga/lib/Makefile \ - gr-sounder/src/fpga/tb/Makefile \ - gr-sounder/src/lib/Makefile \ - gr-sounder/src/python/Makefile \ - gr-sounder/src/python/run_tests - ]) - - GRC_BUILD_CONDITIONAL(gr-sounder,[ - dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_sounder], [chmod +x gr-sounder/src/python/run_tests]) - ]) -]) diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4 index 5d11acc22..57c75bf51 100644 --- a/config/grc_gr_trellis.m4 +++ b/config/grc_gr_trellis.m4 @@ -22,6 +22,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[ dnl Don't do gr-trellis if gnuradio-core skipped GRC_CHECK_DEPENDENCY(gr-trellis, gnuradio-core) + GRC_CHECK_DEPENDENCY(gr-trellis, gr-digital) AC_CONFIG_FILES([\ gr-trellis/Makefile \ diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 111b0ae43..0da087c48 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -49,6 +49,11 @@ AC_DEFUN([GRC_GR_UHD],[ gr-uhd/swig/run_tests \ gr-uhd/swig/run_guile_tests \ gr-uhd/apps/Makefile \ + gr-uhd/apps/hf_explorer/Makefile \ + 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,[ diff --git a/config/grc_gr_vocoder.m4 b/config/grc_gr_vocoder.m4 new file mode 100644 index 000000000..df75656fe --- /dev/null +++ b/config/grc_gr_vocoder.m4 @@ -0,0 +1,49 @@ +dnl Copyright 2011 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_VOCODER],[ + GRC_ENABLE(gr-vocoder) + + dnl Don't do gr-vocoder if gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-fr-vocoder, gnuradio-core) + + AC_CONFIG_FILES([\ + gr-vocoder/Makefile \ + gr-vocoder/gnuradio-vocoder.pc \ + gr-vocoder/apps/Makefile \ + gr-vocoder/doc/Makefile \ + gr-vocoder/examples/Makefile \ + gr-vocoder/grc/Makefile \ + gr-vocoder/include/Makefile \ + gr-vocoder/lib/Makefile \ + gr-vocoder/lib/codec2/Makefile \ + gr-vocoder/lib/g7xx/Makefile \ + gr-vocoder/lib/gsm/Makefile \ + gr-vocoder/python/Makefile \ + gr-vocoder/python/run_tests \ + gr-vocoder/swig/Makefile \ + gr-vocoder/swig/run_guile_tests \ + ]) + + GRC_BUILD_CONDITIONAL(gr-vocoder,[ + dnl run_tests is created from run_tests.in. Make it executable. + AC_CONFIG_COMMANDS([run_tests_vocoder], [chmod +x gr-vocoder/python/run_tests]) + AC_CONFIG_COMMANDS([run_tests_vocoder_guile], [chmod +x gr-vocoder/swig/run_guile_tests]) + ]) +]) |