[Commit-gnuradio] r8077 - in gnuradio/branches/developers/eb/trunk-with-gcell: . config gcell/src/lib/general/spu gcell/src/lib/procs/spu gcell/src/lib/runtime gcell/src/lib/runtime/spu gcell/src/lib/spu

[eb]

Author: eb
Date: 2008-03-23 00:39:17 -0600 (Sun, 23 Mar 2008)
New Revision: 8077

Removed:
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/spu/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/spu/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/spu/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/spu/Makefile.am.incl
Modified:
   gnuradio/branches/developers/eb/trunk-with-gcell/bootstrap
   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/runtime/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am
Log:
almost done...

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/bootstrap
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/bootstrap  2008-03-23 
03:41:40 UTC (rev 8076)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/bootstrap  2008-03-23 
06:39:17 UTC (rev 8077)
@@ -26,4 +26,5 @@
 autoconf
 autoheader
 libtoolize --automake
-automake --add-missing -Wno-portability -Wno-override -Wnone
+#automake --add-missing -Wno-portability -Wno-override -Wnone
+automake --add-missing -Wno-portability

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-23 03:41:40 UTC (rev 8076)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4        
2008-03-23 06:39:17 UTC (rev 8077)
@@ -41,11 +41,15 @@
     if test $passed != with; then
        dnl how and where to find INCLUDES and LA
        gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include \
-                       -I\${abs_top_srcdir}/gcell/src/lib"
+                -I\${abs_top_srcdir}/gcell/src/lib/runtime \
+                -I\${abs_top_srcdir}/gcell/src/lib/general \
+                -I\${abs_top_srcdir}/gcell/src/lib/procs"
         gcell_LA="\${abs_top_builddir}/gcell/src/lib/libgcell.la"
        gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include/spu \
-                       -I\${abs_top_srcdir}/gcell/src/include \
-                       -I\${abs_top_srcdir}/gcell/src/lib"
+                -I\${abs_top_srcdir}/gcell/src/include \
+                -I\${abs_top_srcdir}/gcell/src/lib/runtime/spu \
+                -I\${abs_top_srcdir}/gcell/src/lib/general/spu \
+                -I\${abs_top_srcdir}/gcell/src/lib/procs/spu"
        gcell_spu_LA="\${abs_top_builddir}/gcell/src/lib/spu/libgcell_spu.a"
        AC_SUBST(gcell_spu_INCLUDES)
        AC_SUBST(gcell_spu_LA)
@@ -60,11 +64,8 @@
         gcell/src/lib/Makefile \
         gcell/src/lib/spu/Makefile \
         gcell/src/lib/general/Makefile \
-        gcell/src/lib/general/spu/Makefile \
         gcell/src/lib/procs/Makefile \
-        gcell/src/lib/procs/spu/Makefile \
         gcell/src/lib/runtime/Makefile \
-        gcell/src/lib/runtime/spu/Makefile \
         gcell/src/apps/Makefile \
        gcell/src/apps/spu/Makefile \
        gcell/src/ibm/Makefile \

Modified: gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac       
2008-03-23 03:41:40 UTC (rev 8076)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac       
2008-03-23 06:39:17 UTC (rev 8077)
@@ -243,6 +243,7 @@
 GRC_MBLOCK                     dnl this must come after GRC_PMT
 GRC_GCELL
 GRC_GNURADIO_CORE
+GRC_USRP
 GRC_GR_USRP                    dnl this must come after GRC_USRP
 GRC_GR_MSDD6000
 GRC_GR_AUDIO_ALSA

Deleted: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/spu/Makefile.am

Deleted: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/spu/Makefile.am

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/Makefile.am
  2008-03-23 03:41:40 UTC (rev 8076)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/Makefile.am
  2008-03-23 06:39:17 UTC (rev 8077)
@@ -59,8 +59,8 @@
 
 
 # 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
+gcell_qa.lo: ../spu/gcell_qa
+       ppu-embedspu -m32 -fpic gcell_qa ../spu/gcell_qa .libs/gcell_qa.o
        @rm -f gcell_qa.lo
        @echo "# gcell_qa.lo - a libtool object file" >> gcell_qa.lo
        @echo "# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 
2005/12/18 22:14:06)" >> gcell_qa.lo

Deleted: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/spu/Makefile.am

Deleted: 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/spu/Makefile.am.incl

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-23 03:41:40 UTC (rev 8076)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am  
    2008-03-23 06:39:17 UTC (rev 8077)
@@ -18,21 +18,86 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+# We're building a single .a file from files in several
+# subdirectories.  We use the "single Makefile, multiple subdirectory"
+# automake alternative. We're doing this because we're faking out
+# automake and getting it to build for 2 architectures at the same
+# time, the PPE (powerpc64) and the SPE.  The easiest way to handle
+# the SPE was to just build a static library using automake's built in
+# rules, since trying to get libtool to handle two architectures in
+# the same tree seemed untenable.
+
 include $(top_srcdir)/Makefile.common.spu
-include $(top_srcdir)/gcell/src/lib/runtime/spu/Makefile.am.incl
 
 IBM_SPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/src/ibm/sync/spu_source
 AM_CPPFLAGS = $(GCELL_SPU_INCLUDES) $(IBM_SPU_SYNC_INCLUDES)
 
-# generate libgcell_spu.a from Makefile.am.incl's in subdirs
-
 lib_LIBRARIES = libgcell_spu.a
 
+# ----------------------------------------------------------------
+# files in the lib/runtime/spu directory
+
+runtime_srcdir = $(srcdir)/../runtime/spu
+
+runtime_spu_sources = \
+       $(runtime_srcdir)/gc_delay.c \
+       $(runtime_srcdir)/gc_spu_jd_queue.c \
+       $(runtime_srcdir)/spu_buffers.c \
+       $(runtime_srcdir)/gc_logging.c \
+       $(runtime_srcdir)/gc_main.c
+
+runtime_spu_headers =
+
+runtime_spu_noinst_headers = \
+       $(runtime_srcdir)/gc_spu_config.h \
+       $(runtime_srcdir)/spu_buffers.h 
+
+# ----------------------------------------------------------------
+# files in the lib/general/spu directory
+
+general_srcdir = $(srcdir)/../general/spu
+
+general_spu_sources =
+
+general_spu_headers =
+
+general_spu_noinst_headers =
+
+
+# ----------------------------------------------------------------
+# files in the lib/procs/spu directory
+
+procs_srcdir = $(srcdir)/../proc/spu
+
+procs_spu_sources =
+
+procs_spu_headers =
+
+procs_spu_noinst_headers =
+
+# ----------------------------------------------------------------
+# build the library from the files in the three directories
+
 libgcell_spu_a_SOURCES = \
-       $(RUNTIME_SPU_SOURCES)
+       $(runtime_spu_sources) \
+       $(general_spu_sources) \
+       $(procs_spu_sources)
 
 gcellspuinclude_HEADERS = \
-       $(RUNTIME_SPU_HEADERS)
+       $(runtime_spu_headers) \
+       $(general_spu_headers) \
+       $(procs_spu_headers)
 
 noinst_HEADERS = \
-       $(RUNTIME_SPU_NOINST_HEADERS)
+       $(runtime_spu_noinst_headers) \
+       $(general_spu_noinst_headers) \
+       $(procs_spu_noinst_headers)
+
+# ----------------------------------------------------------------
+# SPU executable containing QA code
+
+noinst_PROGRAMS = \
+       gcell_qa
+
+gcell_qa_SOURCES = $(runtime_srcdir)/gcell_qa.c
+gcell_qa_LDADD = libgcell_spu.a