[Commit-gnuradio] r10151 - in gnuradio/branches/developers/eb/gcell-wip2/gcell/lib: runtime wrapper

[eb]

Author: eb
Date: 2008-12-21 17:33:42 -0700 (Sun, 21 Dec 2008)
New Revision: 10151

Modified:
   gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/runtime/Makefile.am
   
gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/runtime/gcell-embedspu-libtool
   gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/wrapper/Makefile.am
Log:
Swap argument order of gcell-embedspu-libtool.  It's now input_file output_file.


Modified: 
gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/runtime/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/runtime/Makefile.am    
2008-12-22 00:32:45 UTC (rev 10150)
+++ gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/runtime/Makefile.am    
2008-12-22 00:33:42 UTC (rev 10151)
@@ -57,7 +57,7 @@
 
 # generate a libtool.lo that contains an embeded SPU executable
 gcell_runtime_qa.lo: ../spu/gcell_runtime_qa
-       $(GCELL_EMBEDSPU_LIBTOOL) $@ $<
+       $(GCELL_EMBEDSPU_LIBTOOL) $< $@
 
 libruntime_qa_la_LIBADD = \
        gcell_runtime_qa.lo \

Modified: 
gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/runtime/gcell-embedspu-libtool
===================================================================
--- 
gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/runtime/gcell-embedspu-libtool
 2008-12-22 00:32:45 UTC (rev 10150)
+++ 
gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/runtime/gcell-embedspu-libtool
 2008-12-22 00:33:42 UTC (rev 10151)
@@ -1,15 +1,19 @@
 #!/bin/bash
+#
+# Take a spu executable and turn into into a libtool compatible .lo (and .o) 
file.
+# This is needed when you want to embed a SPU executable into a shared library.
 
+
 if [ $# -ne 2 ]; then
-  echo "usage: gcell-embedspu-libtool file.lo spu_executable_file" 1>&2
+  echo "usage: gcell-embedspu-libtool spu_executable output_file.lo " 1>&2
   exit 1
 fi
 
-lo_file=$1
-spu_executable=$2
+spu_executable=$1
+lo_file=$2
 symbol_name=${lo_file%%.lo}
 
-# try to make .libs
+# try to make .libs in case it's not there
 mkdir .libs >/dev/null 2>/dev/null
 
 # generate the .o file that wraps the SPU executable

Modified: 
gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/wrapper/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/wrapper/Makefile.am    
2008-12-22 00:32:45 UTC (rev 10150)
+++ gnuradio/branches/developers/eb/gcell-wip2/gcell/lib/wrapper/Makefile.am    
2008-12-22 00:33:42 UTC (rev 10151)
@@ -28,10 +28,10 @@
 # generate libtool.lo's that contain embedded SPU executables
 #
 gcell_all.lo: ../spu/gcell_all
-       $(GCELL_EMBEDSPU_LIBTOOL) $@ $<
+       $(GCELL_EMBEDSPU_LIBTOOL) $< $@ 
 
 gcell_general_qa.lo: ../spu/gcell_general_qa
-       $(GCELL_EMBEDSPU_LIBTOOL) $@ $<
+       $(GCELL_EMBEDSPU_LIBTOOL) $< $@