[Commit-gnuradio] r4319 - in gnuradio/branches/developers/eb/omni: . con

commit-gnuradio
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4319 - in gnuradio/branches/developers/eb/omni: . con

From:	eb
Subject:	[Commit-gnuradio] r4319 - in gnuradio/branches/developers/eb/omni: . config gnuradio-core gnuradio-core/src/lib omnithread
Date:	Mon, 29 Jan 2007 13:29:42 -0700 (MST)
Author: eb
Date: 2007-01-29 13:29:41 -0700 (Mon, 29 Jan 2007)
New Revision: 4319

Added:
   gnuradio/branches/developers/eb/omni/config/grc_omnithread.m4
   gnuradio/branches/developers/eb/omni/omnithread/
Removed:
   gnuradio/branches/developers/eb/omni/gnuradio-core/src/lib/omnithread/
Modified:
   gnuradio/branches/developers/eb/omni/Makefile.common
   gnuradio/branches/developers/eb/omni/config/grc_gnuradio_core.m4
   gnuradio/branches/developers/eb/omni/config/grc_mblock.m4
   gnuradio/branches/developers/eb/omni/configure.ac
   gnuradio/branches/developers/eb/omni/gnuradio-core/gnuradio-core.pc.in
   gnuradio/branches/developers/eb/omni/gnuradio-core/src/lib/Makefile.am
   gnuradio/branches/developers/eb/omni/omnithread/Makefile.am
Log:
Extracted omnithread from gnuradio-core and made it a top level
component.  This allows it to be used by mblock w/out a dependency on
gnuradio-core. 


Modified: gnuradio/branches/developers/eb/omni/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/omni/Makefile.common        2007-01-29 
14:27:05 UTC (rev 4318)
+++ gnuradio/branches/developers/eb/omni/Makefile.common        2007-01-29 
20:29:41 UTC (rev 4319)
@@ -50,7 +50,6 @@
                    -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
                    -I$(top_srcdir)/gnuradio-core/src/lib/io \
                    -I$(top_srcdir)/gnuradio-core/src/lib/g72x \
-                   -I$(top_srcdir)/gnuradio-core/src/lib/omnithread \
                    -I$(top_srcdir)/gnuradio-core/src/lib/swig \
                    -I$(top_builddir)/gnuradio-core/src/lib/swig \
                    $(FFTW3F_CFLAGS)
@@ -58,6 +57,7 @@
 
 # These used to be set in PKGCONFIG but now point to the current
 # build tree.
+# FIXME shouldn't -lfftw3f -lm just be extracted from libgnuradio-core.la ???
 GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
                      -lgnuradio-core -lfftw3f -lm
 
@@ -69,15 +69,17 @@
 USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
                -I$(top_srcdir)/usrp/firmware/include
 
-USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
-           -lusrp
+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
 
+OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread
+OMNITHREAD_LIBS = -L$(top_builddir)/omnithread -lgromnithread
+
 # 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)
+STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) 
$(GNURADIO_INCLUDES) $(BOOST_CFLAGS)
 
 # Fix for BSD make not defining $(RM).  We define it now in configure.ac
 # using AM_PATH_PROG, but now here have to add a -f to be like GNU make

Modified: gnuradio/branches/developers/eb/omni/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/eb/omni/config/grc_gnuradio_core.m4    
2007-01-29 14:27:05 UTC (rev 4318)
+++ gnuradio/branches/developers/eb/omni/config/grc_gnuradio_core.m4    
2007-01-29 20:29:41 UTC (rev 4319)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -37,7 +37,6 @@
         gnuradio-core/src/lib/gengen/Makefile \
         gnuradio-core/src/lib/io/Makefile \
         gnuradio-core/src/lib/missing/Makefile \
-        gnuradio-core/src/lib/omnithread/Makefile \
         gnuradio-core/src/lib/reed-solomon/Makefile \
         gnuradio-core/src/lib/runtime/Makefile \
         gnuradio-core/src/lib/swig/Makefile \
@@ -55,6 +54,16 @@
     ])
     
     passed=yes
+    # Don't do gnuradio-core if omnithread skipped
+    # There *has* to be a better way to check if a value is in a string
+    for dir in $skipped_dirs
+    do
+       if test x$dir = xomnithread; then
+           AC_MSG_RESULT([Component gnuradio-core requires omnithread, which 
is not being built.])
+           passed=no
+       fi
+    done
+
     GRC_BUILD_CONDITIONAL([gnuradio-core],[
         dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_core], [chmod +x 
gnuradio-core/src/python/gnuradio/gr/run_tests])

Modified: gnuradio/branches/developers/eb/omni/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/eb/omni/config/grc_mblock.m4   2007-01-29 
14:27:05 UTC (rev 4318)
+++ gnuradio/branches/developers/eb/omni/config/grc_mblock.m4   2007-01-29 
20:29:41 UTC (rev 4319)
@@ -28,6 +28,16 @@
     ])
 
     passed=yes
+    # Don't do mblock if omnithread skipped
+    # There *has* to be a better way to check if a value is in a string
+    for dir in $skipped_dirs
+    do
+       if test x$dir = xomnithread; then
+           AC_MSG_RESULT([Component mblock requires omnithread, which is not 
being built.])
+           passed=no
+       fi
+    done
+
     # Don't do mblock if pmt skipped
     # There *has* to be a better way to check if a value is in a string
     for dir in $skipped_dirs

Added: gnuradio/branches/developers/eb/omni/config/grc_omnithread.m4
===================================================================
--- gnuradio/branches/developers/eb/omni/config/grc_omnithread.m4               
                (rev 0)
+++ gnuradio/branches/developers/eb/omni/config/grc_omnithread.m4       
2007-01-29 20:29:41 UTC (rev 4319)
@@ -0,0 +1,33 @@
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007 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., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_OMNITHREAD],[
+    GRC_ENABLE([omnithread])
+
+    AC_CONFIG_FILES([ \
+        omnithread/Makefile \
+    ])
+    
+    passed=yes
+    GRC_BUILD_CONDITIONAL([omnithread],[
+        dnl run_tests is created from run_tests.in.  Make it executable.
+       dnl AC_CONFIG_COMMANDS([run_tests_omnithread], [chmod +x 
omnithread/run_tests])
+
+    ])
+])

Modified: gnuradio/branches/developers/eb/omni/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/omni/configure.ac   2007-01-29 14:27:05 UTC 
(rev 4318)
+++ gnuradio/branches/developers/eb/omni/configure.ac   2007-01-29 20:29:41 UTC 
(rev 4319)
@@ -184,6 +184,7 @@
 )
 
 build_dirs="config"
+GRC_OMNITHREAD                 dnl must come before gnuradio-core and mblock
 GRC_GNURADIO_CORE
 GRC_USRP
 GRC_GR_USRP                    dnl this must come after GRC_USRP

Modified: gnuradio/branches/developers/eb/omni/gnuradio-core/gnuradio-core.pc.in
===================================================================
--- gnuradio/branches/developers/eb/omni/gnuradio-core/gnuradio-core.pc.in      
2007-01-29 14:27:05 UTC (rev 4318)
+++ gnuradio/branches/developers/eb/omni/gnuradio-core/gnuradio-core.pc.in      
2007-01-29 20:29:41 UTC (rev 4319)
@@ -7,5 +7,5 @@
 Description: GNU Software Radio toolkit
 Requires:
 Version: @VERSION@
-Libs: -L${libdir} -lgnuradio-core @FFTW3F_LIBS@
+Libs: -L${libdir} -lgnuradio-core @FFTW3F_LIBS@ @OMNITHREAD_LIBS@
 Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@

Modified: gnuradio/branches/developers/eb/omni/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/omni/gnuradio-core/src/lib/Makefile.am      
2007-01-29 14:27:05 UTC (rev 4318)
+++ gnuradio/branches/developers/eb/omni/gnuradio-core/src/lib/Makefile.am      
2007-01-29 20:29:41 UTC (rev 4319)
@@ -24,7 +24,7 @@
 ## Process this file with automake to produce Makefile.in
 
 # We've got to build . before swig
-SUBDIRS = missing runtime filter general gengen g72x reed-solomon omnithread 
io . swig
+SUBDIRS = missing runtime filter general gengen g72x reed-solomon io . swig
 
 # generate libgnuradio-core.la from the convenience libraries in subdirs
 
@@ -35,7 +35,7 @@
 
 libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc
 libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
-                               $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
+                                $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
 
 libgnuradio_core_la_LIBADD  =          \
        filter/libfilter.la             \
@@ -44,9 +44,9 @@
        gengen/libgengen.la             \
        io/libio.la                     \
        missing/libmissing.la           \
-       omnithread/libomnithread.la     \
        reed-solomon/librs.la           \
        runtime/libruntime.la           \
+       $(OMNITHREAD_LIBS)              \
        $(FFTW3F_LIBS)
 
 libgnuradio_core_qa_la_LIBADD  =       \

Copied: gnuradio/branches/developers/eb/omni/omnithread (from rev 4315, 
gnuradio/branches/developers/eb/omni/gnuradio-core/src/lib/omnithread)

Modified: gnuradio/branches/developers/eb/omni/omnithread/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/omni/gnuradio-core/src/lib/omnithread/Makefile.am
   2007-01-29 00:13:34 UTC (rev 4315)
+++ gnuradio/branches/developers/eb/omni/omnithread/Makefile.am 2007-01-29 
20:29:41 UTC (rev 4319)
@@ -27,23 +27,24 @@
 # we should do some configure hacking to determine these on the fly
 OMNITHREAD_DEFINES = -DPthreadDraftVersion=10
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(OMNITHREAD_DEFINES)
+INCLUDES = $(DEFINES) $(OMNITHREAD_DEFINES) $(OMNITHREAD_INCLUDES)
 
-noinst_LTLIBRARIES = libomnithread.la
+# we call it libgromnithread to avoid a collision with libomnithread on Debian
+lib_LTLIBRARIES = libgromnithread.la
 
 # At this point we only support the posix and nt pthreads i/f...
 
 if OMNITHREAD_POSIX
-libomnithread_la_SOURCES =             \
+libgromnithread_la_SOURCES =           \
        posix.cc
 endif
 
 if OMNITHREAD_NT
-libomnithread_la_SOURCES =             \
+libgromnithread_la_SOURCES =           \
        nt.cc
 endif
 
-libomnithread_la_LIBADD =              \
+libgromnithread_la_LIBADD =            \
        $(PTHREAD_LIBS)
 
 # ... but this code also came with the package
[Prev in Thread]
Current Thread
[Next in Thread]
[Commit-gnuradio] r4319 - in gnuradio/branches/developers/eb/omni: . config gnuradio-core gnuradio-core/src/lib omnithread, eb <=
Prev by Date: [Commit-gnuradio] r4318 - gnuradio/branches/developers/trondeau
Next by Date: [Commit-gnuradio] r4320 - gnuradio/trunk/gnuradio-examples/python/usrp
Previous by thread: [Commit-gnuradio] r4318 - gnuradio/branches/developers/trondeau
Next by thread: [Commit-gnuradio] r4320 - gnuradio/trunk/gnuradio-examples/python/usrp
Index(es):
- Date
- Thread