Merged eb/gcell-wip2 rev 10130:10152 into trunk.

This makes several gcell related changes.

{{{
The first two are INCOMPATIBLE CHANGES:

(1) The gcell portion of the code base was reorganized.  As part of that
reorganization, the paths to the include files changed.  They are now
installed under PREFIX/include/gcell instead of directly in PREFIX/include.

This means that all includes of the form:

  #include <gc_foo.h>

should be changed to

  #include <gcell/gc_foo.h>


(2a) If you are directly using gcell-embedspu-libtool or the
$(GCELL_EMBEDSPU_LIBTOOL) variable in your Makefiles, the order of the
two command line arguments was switched.  It's now 

  $(GCELL_EMBEDSPU_LIBTOOL) input_file output_file

or equivalently

  $(GCELL_EMBEDSPU_LIBTOOL) $< $@


gcell-embedspu-libtool allows you to convert an SPE executable
into something that libtool will allow you add to a host shared library.


(2b) The name of the symbol created by gcell-embedspu-libtool is now
suffixed with _spx (SPE executable) to reduce the probability of name
collision.  If you have lines like this:

  extern spe_program_handle_t gcell_all;

in your code, you may have to change them to:

  extern spe_program_handle_t gcell_all_spx;



The following changes are enhancements and shouldn't break any
existing code:


(3) We now install two new pkg-config files, gcell.pc and gcell_spu.pc.
These can be used to assist in building gcell code that lives outside
the GNU Radio repository.  The first gives the include and library
paths for the PPE host code, the second is the same info for the the
SPE code.

There is also a new .m4 macro, GR_GCELL, contained in
config/gr_gcell.m4, that uses PKG_CONFIG_MODULES to fish out the
relevant variables.  If you've got standalone code that uses gcell,
you'll probably want to copy this macro (along with our version of
pkg.m4) to your tree and use it.  It sets the following variables:

  GCELL_CFLAGS
  GCELL_CPPFLAGS
  GCELL_INCLUDEDIR
  GCELL_LIBS
  GCELL_SPU_CFLAGS
  GCELL_SPU_CPPFLAGS
  GCELL_SPU_INCLUDEDIR
  GCELL_SPU_LIBS
  GCELL_EMBEDSPU_LIBTOOL


(4) make -j now works in the gcell directory (fixes ticket:242).
}}}



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10153 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 138 insertions, 0 deletions

diff --git a/gcell/lib/spu/Makefile.am b/gcell/lib/spu/Makefile.am
new file mode 100644
index 000000000..5afa40e36
--- /dev/null
+++ b/gcell/lib/spu/Makefile.am
@@ -0,0 +1,138 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 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
+
+IBM_SPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/spu_source
+AM_CPPFLAGS = $(GCELL_SPU_INCLUDES) $(IBM_SPU_SYNC_INCLUDES)
+
+libspu_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_srcdir)/gc_random.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_srcdir)/fft_1d_r2.c \
+	$(general_srcdir)/memset.S
+
+general_spu_headers =
+# These now live in include/gcell/spu
+#general_spu_headers = \
+#	$(general_srcdir)/gc_spu_macs.h \
+#	$(general_srcdir)/libfft.h
+
+general_spu_noinst_headers =
+# As do these
+#general_spu_noinst_headers = \
+#	$(general_srcdir)/fft_1d.h \
+#	$(general_srcdir)/fft_1d_r2.h
+
+# The QA code for (usually) non-PPE visible support routines in lib/general/spu
+general_spu_qa_sources = \
+	$(general_srcdir)/qa_memset.c
+
+# ----------------------------------------------------------------
+# files in the lib/wrapper/spu directory
+
+wrapper_srcdir = $(srcdir)/../wrapper/spu
+
+wrapper_spu_sources = \
+	$(wrapper_srcdir)/gcs_fft_1d_r2.c
+
+wrapper_spu_headers =
+
+wrapper_spu_noinst_headers =
+
+# ----------------------------------------------------------------
+# build the library from the files in the three directories
+
+libgcell_spu_a_SOURCES = \
+	$(runtime_spu_sources) \
+	$(general_spu_sources) \
+	$(wrapper_spu_sources)
+
+gcellspuinclude_HEADERS = \
+	$(runtime_spu_headers) \
+	$(general_spu_headers) \
+	$(wrapper_spu_headers)
+
+noinst_HEADERS = \
+	$(runtime_spu_noinst_headers) \
+	$(general_spu_noinst_headers) \
+	$(wrapper_spu_noinst_headers)
+
+# ----------------------------------------------------------------
+# build some SPU executables
+
+libspu_PROGRAMS = \
+	gcell_all
+
+noinst_PROGRAMS = \
+	gcell_runtime_qa \
+	gcell_general_qa
+
+#
+# All known non-QA gcell procs (at least until they get too big).
+#
+gcell_all_SOURCES = $(wrapper_spu_sources)
+gcell_all_LDADD = libgcell_spu.a
+
+#
+# The QA code required for testing the runtime.
+#
+gcell_runtime_qa_SOURCES = $(runtime_srcdir)/gcell_runtime_qa.c
+gcell_runtime_qa_LDADD = libgcell_spu.a
+
+#
+# The QA code required for testing the SPE support routines in lib/general/spu
+#
+gcell_general_qa_SOURCES = $(general_spu_qa_sources)
+gcell_general_qa_LDADD = libgcell_spu.a