[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8075 - in gnuradio/branches/developers/eb/trunk-with-
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r8075 - in gnuradio/branches/developers/eb/trunk-with-gcell: . config gcell/src/lib gcell/src/lib/general gcell/src/lib/general/spu gcell/src/lib/procs gcell/src/lib/procs/spu gcell/src/lib/runtime gcell/src/lib/runtime/spu gcell/src/lib/spu |
|
Date: |
Sat, 22 Mar 2008 20:28:06 -0600 (MDT) |
Author: eb
Date: 2008-03-22 20:28:03 -0600 (Sat, 22 Mar 2008)
New Revision: 8075
Added:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/Makefile.am
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/spu/
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/
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/Makefile.am
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/spu/
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.incl
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am
Modified:
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/
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/Makefile.am
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/spu/Makefile.am
Log:
work-in-progress
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-22 23:36:17 UTC (rev 8074)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/config/grc_gcell.m4
2008-03-23 02:28:03 UTC (rev 8075)
@@ -55,13 +55,19 @@
gcell/Makefile \
gcell/gcell.pc \
gcell/src/Makefile \
- gcell/src/apps/Makefile \
- gcell/src/apps/spu/Makefile \
- gcell/src/ibm/Makefile \
gcell/src/include/Makefile \
gcell/src/include/spu/Makefile \
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 \
])
GRC_BUILD_CONDITIONAL(gcell)
Modified: gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac
2008-03-22 23:36:17 UTC (rev 8074)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/configure.ac
2008-03-23 02:28:03 UTC (rev 8075)
@@ -239,10 +239,10 @@
build_dirs="config"
GRC_OMNITHREAD dnl must come before gnuradio-core and mblock
-GRC_GNURADIO_CORE
GRC_PMT
GRC_MBLOCK dnl this must come after GRC_PMT
-GRC_USRP
+GRC_GCELL
+GRC_GNURADIO_CORE
GRC_GR_USRP dnl this must come after GRC_USRP
GRC_GR_MSDD6000
GRC_GR_AUDIO_ALSA
@@ -264,7 +264,6 @@
GRC_GR_WXGUI
GRC_GR_SOUNDER dnl this must come after GRC_USRP
GRC_GR_UTILS dnl this must come after GRC_GR_WXGUI
-GRC_GCELL
GRC_GNURADIO_EXAMPLES dnl must come last
# Each component is now either to be built, was skipped, will be
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
*.la
*.lo
*.a
*.o
Added:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
(rev 0)
+++ gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
2008-03-23 02:28:03 UTC (rev 8075)
@@ -0,0 +1,48 @@
+#
+# 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.
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = spu runtime general procs .
+
+# generate libgcell.la from the convenience libraries in subdirs
+
+lib_LTLIBRARIES = libgcell.la libgcell-qa.la
+
+libgcell_la_SOURCES =
+libgcell_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+
+libgcell_qa_la_SOURCES =
+libgcell_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+
+libgcell_la_LIBADD = \
+ runtime/libruntime.la \
+ -lspe2 \
+ $(OMNITHREAD_LA)
+
+libgcell_qa_la_LIBADD = \
+ runtime/libruntime-qa.la \
+ $(CPPUNIT_LIBS)
+
+
+
+
+
+
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
*.la
*.lo
*.a
*.o
Added:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/Makefile.am
(rev 0)
+++
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/Makefile.am
2008-03-23 02:28:03 UTC (rev 8075)
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+
+include $(top_srcdir)/Makefile.common
+
+# SUBDIRS = spu .
+
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/spu
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
*.la
*.lo
*.a
*.o
Added:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/spu/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/spu/Makefile.am
(rev 0)
+++
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/spu/Makefile.am
2008-03-23 02:28:03 UTC (rev 8075)
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+include $(top_srcdir)/Makefile.common.spu
+
+
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/general/spu/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
*.la
*.lo
*.a
*.o
Added:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/Makefile.am
(rev 0)
+++
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/Makefile.am
2008-03-23 02:28:03 UTC (rev 8075)
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+
+include $(top_srcdir)/Makefile.common
+
+# SUBDIRS = spu .
+
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/spu
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
*.la
*.lo
*.a
*.o
Added:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/spu/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/spu/Makefile.am
(rev 0)
+++
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/spu/Makefile.am
2008-03-23 02:28:03 UTC (rev 8075)
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+include $(top_srcdir)/Makefile.common.spu
+
+
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/procs/spu/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
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-22 23:36:17 UTC (rev 8074)
+++
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/Makefile.am
2008-03-23 02:28:03 UTC (rev 8075)
@@ -20,7 +20,7 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = spu .
+# SUBDIRS = spu .
IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/src/ibm/sync/ppu_source
@@ -29,20 +29,16 @@
$(GCELL_INCLUDES) $(IBM_PPU_SYNC_INCLUDES) $(WITH_INCLUDES)
-lib_LTLIBRARIES = libgcell.la libgcell-qa.la
+noinst_LTLIBRARIES = libruntime.la libruntime-qa.la
-libgcell_la_SOURCES = \
+libruntime_la_SOURCES = \
gc_job_manager.cc \
gc_job_manager_impl.cc \
gc_jd_queue.c \
gc_jd_stack.c \
gc_proc_def_utils.cc
-libgcell_la_LIBADD = \
- -lspe2 \
- $(OMNITHREAD_LA)
-
-libgcell_qa_la_SOURCES = \
+libruntime_qa_la_SOURCES = \
qa_lib.cc \
qa_jd_queue.cc \
qa_jd_stack.cc \
@@ -75,7 +71,6 @@
@echo "pic_object='.libs/gcell_qa.o'" >> gcell_qa.lo
@echo "non_pic_object=none" >> gcell_qa.lo
-libgcell_qa_la_LIBADD = \
+libruntime_qa_la_LIBADD = \
gcell_qa.lo \
- libgcell.la \
- $(CPPUNIT_LIBS)
+ libruntime.la
Modified:
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
2008-03-22 23:36:17 UTC (rev 8074)
+++
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/spu/Makefile.am
2008-03-23 02:28:03 UTC (rev 8075)
@@ -26,10 +26,10 @@
# library of SPU code
-libspu_LIBRARIES = \
- libgcell_spu.a
+noinst_LIBRARIES = \
+ libruntime_spu.a
-libgcell_spu_a_SOURCES = \
+libruntime_spu_a_SOURCES = \
gc_delay.c \
gc_spu_jd_queue.c \
spu_buffers.c \
@@ -46,4 +46,4 @@
noinst_PROGRAMS = \
gcell_qa
-gcell_qa_LDADD = libgcell_spu.a
+gcell_qa_LDADD = libruntime_spu.a
Copied:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/spu/Makefile.am.incl
(from rev 8067,
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
(rev 0)
+++
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/runtime/spu/Makefile.am.incl
2008-03-23 02:28:03 UTC (rev 8075)
@@ -0,0 +1,43 @@
+# -*- Makefile -*-
+#
+# Copyright 2007,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.
+#
+
+# define vars that are used in gcell/src/lib/spu/Makefile.am
+
+RUNTIME_SPU_SOURCES = \
+ gc_delay.c \
+ gc_spu_jd_queue.c \
+ spu_buffers.c \
+ gc_logging.c \
+ gc_main.c
+
+RUNTIME_SPU_HEADERS =
+
+RUNTIME_SPU_NOINST_HEADERS = \
+ gc_spu_config.h \
+ spu_buffers.h
+
+
+
+# SPU executable containing QA code
+#noinst_PROGRAMS = \
+# gcell_qa
+
+#gcell_qa_LDADD = libruntime_spu.a
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.deps
.libs
*.la
*.lo
*.a
*.o
Added:
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
(rev 0)
+++
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am
2008-03-23 02:28:03 UTC (rev 8075)
@@ -0,0 +1,38 @@
+#
+# 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.
+#
+
+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
+
+libgcell_spu_a_SOURCES = \
+ $(RUNTIME_SPU_SOURCES)
+
+gcellspuinclude_HEADERS = \
+ $(RUNTIME_SPU_HEADERS)
+
+noinst_HEADERS = \
+ $(RUNTIME_SPU_NOINST_HEADERS)
Property changes on:
gnuradio/branches/developers/eb/trunk-with-gcell/gcell/src/lib/spu/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8075 - in gnuradio/branches/developers/eb/trunk-with-gcell: . config gcell/src/lib gcell/src/lib/general gcell/src/lib/general/spu gcell/src/lib/procs gcell/src/lib/procs/spu gcell/src/lib/runtime gcell/src/lib/runtime/spu gcell/src/lib/spu,
eb <=