[Commit-gnuradio] r3331 - in gnuradio/trunk: . config

[eb]

Author: eb
Date: 2006-08-16 19:10:20 -0600 (Wed, 16 Aug 2006)
New Revision: 3331

Added:
   gnuradio/trunk/config/grc_mblock.m4
   gnuradio/trunk/mblock/
Modified:
   gnuradio/trunk/Makefile.common
   gnuradio/trunk/config/Makefile.am
   gnuradio/trunk/configure.ac
Log:
merged in mblock work-in-progress

Modified: gnuradio/trunk/Makefile.common
===================================================================
--- gnuradio/trunk/Makefile.common      2006-08-17 00:39:57 UTC (rev 3330)
+++ gnuradio/trunk/Makefile.common      2006-08-17 01:10:20 UTC (rev 3331)
@@ -68,6 +68,9 @@
 USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
            -lusrp
 
+PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
+PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
+
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
 STD_DEFINES_AND_INCLUDES=$(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS)

Modified: gnuradio/trunk/config/Makefile.am
===================================================================
--- gnuradio/trunk/config/Makefile.am   2006-08-17 00:39:57 UTC (rev 3330)
+++ gnuradio/trunk/config/Makefile.am   2006-08-17 01:10:20 UTC (rev 3331)
@@ -49,6 +49,7 @@
        grc_gr_usrp.m4 \
        grc_gr_video_sdl.m4 \
        grc_gr_wxgui.m4 \
+       grc_mblock.m4 \
        gr_check_createfilemapping.m4 \
        gr_check_mc4020.m4 \
        gr_check_shm_open.m4 \

Copied: gnuradio/trunk/config/grc_mblock.m4 (from rev 3328, 
gnuradio/branches/developers/eb/mblock/config/grc_mblock.m4)
===================================================================
--- gnuradio/trunk/config/grc_mblock.m4                         (rev 0)
+++ gnuradio/trunk/config/grc_mblock.m4 2006-08-17 01:10:20 UTC (rev 3331)
@@ -0,0 +1,34 @@
+dnl Copyright 2001,2002,2003,2004,2005,2006 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 2, 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., 59 Temple Place - Suite 330,
+dnl Boston, MA 02111-1307, USA.
+
+AC_DEFUN([GRC_MBLOCK],[
+    AC_CONFIG_SRCDIR([mblock/src/lib/mb_mblock.h])
+
+    AC_CONFIG_FILES([\
+       mblock/Makefile \
+       mblock/doc/Makefile \
+       mblock/src/Makefile \
+       mblock/src/lib/Makefile
+    ])
+
+    dnl run_tests is created from run_tests.in.  Make it executable.
+    dnl AC_CONFIG_COMMANDS([run_tests_mblock], [chmod +x 
mblock/src/python/run_tests])
+
+    subdirs="$subdirs mblock"
+])

Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2006-08-17 00:39:57 UTC (rev 3330)
+++ gnuradio/trunk/configure.ac 2006-08-17 01:10:20 UTC (rev 3331)
@@ -169,6 +169,7 @@
 GRC_GR_VIDEO_SDL
 GRC_GR_WXGUI
 GRC_PMT
+GRC_MBLOCK                     dnl this must come after GRC_PMT
 GRC_GR_TRELLIS
 dnl GRC_EZDOP                  dnl disable until grc_ezdop.m4 fixed
 dnl GRC_GR_EZDOP               dnl this must come after GRC_EZDOP

Copied: gnuradio/trunk/mblock (from rev 3328, 
gnuradio/branches/developers/eb/mblock/mblock)