[Commit-gnuradio] r8064 - in gnuradio/branches/developers/eb/trunk-with-gcell: . config gcell/src/lib gcell/src/lib/spu

[eb]

Author: eb
Date: 2008-03-20 16:46:12 -0600 (Thu, 20 Mar 2008)
New Revision: 8064

Modified:
   gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.am
   gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common
   gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4
   gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac
   gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am
Log:
tarball builds OK

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.am        
2008-03-20 14:40:24 UTC (rev 8063)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.am        
2008-03-20 22:46:12 UTC (rev 8064)
@@ -25,6 +25,7 @@
 
 EXTRA_DIST = \
        configure \
+       configure-cell-cross \
        config.h.in \
        run_tests.sh.in \
        README.hacking

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common    
2008-03-20 14:40:24 UTC (rev 8063)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/Makefile.common    
2008-03-20 22:46:12 UTC (rev 8064)
@@ -28,10 +28,6 @@
 # swig includes
 swigincludedir = $(grincludedir)/swig
 
-# gcell includes
-gcellincludedir = $(includedir)/gcell
-gcellspuincludedir = $(includedir)/gcell/spu
-
 # Install the gnuradio stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -46,6 +42,14 @@
 usrppythondir = $(pythondir)/usrpm
 usrppyexecdir = $(pyexecdir)/usrpm
 
+# gcell includes
+gcellincludedir = $(includedir)/gcell
+gcellspuincludedir = $(includedir)/gcell/spu
+
+# Cell spu libs
+libspudir = $(libdir)spu
+
+
 # when including for compilation from pre-installed libraries and such,
 # need to make sure those are put last on the compile command
 WITH_INCLUDES = @with_INCLUDES@

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4        
2008-03-20 14:40:24 UTC (rev 8063)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4        
2008-03-20 22:46:12 UTC (rev 8064)
@@ -31,16 +31,10 @@
     dnl   yes  : if the --enable code passed muster and all dependencies are 
met
     dnl   no   : otherwise
     if test $passed = yes; then
-        dnl Don't do gcell if we can't find spu-gcc or we're not 
cross-compiling.
-       dnl The cross-compiling check is a bit over-the-top, but we want to 
avoid
-       dnl accidentally triggering this component unless folks know what 
they're doing.
-       if test x$cross_compiling != xyes; then
-           passed=no
-       else
-           AC_CHECK_PROG([SPU_GCC_PROG],[spu-gcc],[yes])
-           if test x$SPU_GCC_PROG != xyes; then
-              passed=no
-            fi
+        dnl Don't do 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
 

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac       
2008-03-20 14:40:24 UTC (rev 8063)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac       
2008-03-20 22:46:12 UTC (rev 8064)
@@ -25,11 +25,6 @@
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-if test x$cross_compiling != xno; then
-  AC_MSG_NOTICE([Configuring GNU Radio for cross compilation])
-else
-  AC_MSG_NOTICE([Configuring GNU Radio for native compilation])
-fi
 
 AM_INIT_AUTOMAKE(gnuradio,3.1svn)
 

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am  
2008-03-20 14:40:24 UTC (rev 8063)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am  
2008-03-20 22:46:12 UTC (rev 8064)
@@ -48,6 +48,20 @@
        qa_jd_stack.cc \
        qa_job_manager.cc
 
+
+gcellinclude_HEADERS = \
+       gc_job_manager.h
+
+noinst_HEADERS = \
+       gc_client_thread_info.h \
+       gc_job_manager_impl.h \
+       gc_proc_def_utils.h \
+       qa_jd_queue.h \
+       qa_jd_stack.h \
+       qa_job_manager.h \
+       qa_lib.h
+
+
 # This kruft is required to link the QA SPU executable into the PPE shared lib 
w/o warnings
 gcell_qa.lo: spu/gcell_qa
        ppu-embedspu -m32 -fpic gcell_qa spu/gcell_qa .libs/gcell_qa.o

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am  
    2008-03-20 14:40:24 UTC (rev 8063)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am  
    2008-03-20 22:46:12 UTC (rev 8064)
@@ -26,7 +26,7 @@
 
 # library of SPU code
 
-noinst_LIBRARIES = \
+libspu_LIBRARIES = \
        libgcell_spu.a
 
 libgcell_spu_a_SOURCES = \
@@ -37,9 +37,13 @@
        gc_main.c
 
 
+noinst_HEADERS = \
+       gc_spu_config.h \
+       spu_buffers.h 
+
+
+# SPU executable containing QA code
 noinst_PROGRAMS = \
        gcell_qa
 
-
-# SPU executable containing QA code
 gcell_qa_LDADD = libgcell_spu.a