[Commit-gnuradio] r3328 - in gnuradio/branches/developers/eb/mblock: . config mblock/src/lib

[eb]

Author: eb
Date: 2006-08-16 18:31:38 -0600 (Wed, 16 Aug 2006)
New Revision: 3328

Added:
   gnuradio/branches/developers/eb/mblock/config/grc_mblock.m4
Modified:
   gnuradio/branches/developers/eb/mblock/Makefile.common
   gnuradio/branches/developers/eb/mblock/mblock/src/lib/Makefile.am
Log:
now compiles and passes distcheck

Modified: gnuradio/branches/developers/eb/mblock/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/mblock/Makefile.common      2006-08-16 
23:55:26 UTC (rev 3327)
+++ gnuradio/branches/developers/eb/mblock/Makefile.common      2006-08-17 
00:31:38 UTC (rev 3328)
@@ -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)

Added: gnuradio/branches/developers/eb/mblock/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/eb/mblock/config/grc_mblock.m4                 
        (rev 0)
+++ gnuradio/branches/developers/eb/mblock/config/grc_mblock.m4 2006-08-17 
00:31:38 UTC (rev 3328)
@@ -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/branches/developers/eb/mblock/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/mblock/mblock/src/lib/Makefile.am   
2006-08-16 23:55:26 UTC (rev 3327)
+++ gnuradio/branches/developers/eb/mblock/mblock/src/lib/Makefile.am   
2006-08-17 00:31:38 UTC (rev 3328)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+INCLUDES = $(PMT_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
 
 # TESTS = test_mblock
 
@@ -41,6 +41,7 @@
 
 # link the library against the c++ standard library
 libmblock_la_LIBADD =                  \
+       $(PMT_LIBS)                     \
        -lstdc++                        
 
 include_HEADERS =                      \
@@ -62,6 +63,7 @@
 
 # link the library against the c++ standard library
 libmblock_qa_la_LIBADD =                       \
+       libmblock.la                            \
        $(CPPUNIT_LIBS)                         \
        -lstdc++