[Commit-gnuradio] r6719 - in gnuradio/branches/developers/eb/cross: . config gr-atsc/src/lib

[eb]

Author: eb
Date: 2007-10-27 18:39:08 -0600 (Sat, 27 Oct 2007)
New Revision: 6719

Modified:
   gnuradio/branches/developers/eb/cross/config/grc_build.m4
   gnuradio/branches/developers/eb/cross/config/pkg.m4
   gnuradio/branches/developers/eb/cross/configure-cell-cross
   gnuradio/branches/developers/eb/cross/configure.ac
   gnuradio/branches/developers/eb/cross/gr-atsc/src/lib/Makefile.am
Log:
work-in-progress

Modified: gnuradio/branches/developers/eb/cross/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/eb/cross/config/grc_build.m4   2007-10-27 
22:18:36 UTC (rev 6718)
+++ gnuradio/branches/developers/eb/cross/config/grc_build.m4   2007-10-28 
00:39:08 UTC (rev 6719)
@@ -20,7 +20,7 @@
 # Create --enable-foo argument for named component, create variables as needed
 # $1 is component name
 AC_DEFUN([GRC_ENABLE],[
-    AC_ARG_ENABLE([$1],[  --enable-$1  Fail build if $1 fails 
configuration],[],
+    AC_ARG_ENABLE([$1],[  --enable-$1  Fail build if $1 fails 
configuration],[],
                   [[enable_]m4_bpatsubst($1,-,_)=$enable_all_components])
 ])
 

Modified: gnuradio/branches/developers/eb/cross/config/pkg.m4
===================================================================
--- gnuradio/branches/developers/eb/cross/config/pkg.m4 2007-10-27 22:18:36 UTC 
(rev 6718)
+++ gnuradio/branches/developers/eb/cross/config/pkg.m4 2007-10-28 00:39:08 UTC 
(rev 6719)
@@ -94,12 +94,15 @@
 # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
 # [ACTION-IF-NOT-FOUND])
 #
+# E.g.,
+#   PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, 
action-not)
+#   defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+#   also defines GSTUFF_PKG_ERRORS on error
 #
 # Note that if there is a possibility the first call to
 # PKG_CHECK_MODULES might not happen, you should be sure to include an
 # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 #
-#
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
@@ -110,8 +113,14 @@
 AC_MSG_CHECKING([for $1])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
 
+if test x$cross_compiling = xyes
+then
+  _PKG_CONFIG([$1][_LIBS], [libs-only-l], [$2])
+else
+  _PKG_CONFIG([$1][_LIBS], [libs], [$2])
+fi
+
 m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables 
$1[]_CFLAGS
 and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])

Modified: gnuradio/branches/developers/eb/cross/configure-cell-cross
===================================================================
--- gnuradio/branches/developers/eb/cross/configure-cell-cross  2007-10-27 
22:18:36 UTC (rev 6718)
+++ gnuradio/branches/developers/eb/cross/configure-cell-cross  2007-10-28 
00:39:08 UTC (rev 6719)
@@ -3,25 +3,20 @@
 scriptdir=`dirname $0`
 
 arch=ppu
-#cell_root=/mnt/ps3
+# cell_root=/mnt/ps3
 cell_root=/opt/cell-root-snapshot
 
-export CC=${arch}32-gcc
-export CXX=${arch}32-g++
-export AR=${arch}-ar
-export NM=${arch}-nm
-export RANLIB=${arch}-ranlib
-export STRIP=${arch}-strip
-export F77=false
+$scriptdir/configure                       \
+    CC=${arch}32-gcc                        \
+    CXX=${arch}32-g++                       \
+    AR=${arch}-ar                           \
+    NM=${arch}-nm                           \
+    RANLIB=${arch}-ranlib                   \
+    STRIP=${arch}-strip                     \
+    F77=false                               \
+    CPPFLAGS=-I${cell_root}/usr/include     \
+    LDFLAGS="-L${cell_root}/lib -L${cell_root}/usr/lib"                        
         \
+    
PKG_CONFIG_PATH=${cell_root}/usr/lib/pkgconfig:${cell_root}/usr/local/lib/pkgconfig
 \
+    --prefix=/home/eb/cell-prefix          \
+    --host=powerpc64-unknown-linux-gnu     
 
-export CPPFLAGS=-I${cell_root}/usr/include
-export LDFLAGS="-L${cell_root}/lib -L${cell_root}/usr/lib"
-
-export PKG_CONFIG_PATH=${cell_root}/usr/lib:${cell_root}/usr/local/lib
-
-export FFTW3F_CFLAGS=
-export FFTW3F_LIBS="-lfftw3f -lm"
-
-$scriptdir/configure                                   \
-    --prefix=/home/eb/cell-prefix                      \
-    --host=powerpc64-unknown-linux-gnu                 

Modified: gnuradio/branches/developers/eb/cross/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/cross/configure.ac  2007-10-27 22:18:36 UTC 
(rev 6718)
+++ gnuradio/branches/developers/eb/cross/configure.ac  2007-10-28 00:39:08 UTC 
(rev 6719)
@@ -191,8 +191,11 @@
 
 dnl Define where to look for cppunit includes and libs
 dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
-AM_PATH_CPPUNIT([1.9.14],[],
-               [AC_MSG_ERROR([GNU Radio requires cppunit.  Stop])])
+dnl Try using pkg-config first, then fall back to cppunit-config.
+PKG_CHECK_EXISTS(cppunit,
+  [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)],
+  [AM_PATH_CPPUNIT([1.9.14],[],
+               [AC_MSG_ERROR([GNU Radio requires cppunit.  Stop])])])
 
 CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS
 AC_SUBST(CPPUNIT_INCLUDES)

Modified: gnuradio/branches/developers/eb/cross/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/cross/gr-atsc/src/lib/Makefile.am   
2007-10-27 22:18:36 UTC (rev 6718)
+++ gnuradio/branches/developers/eb/cross/gr-atsc/src/lib/Makefile.am   
2007-10-28 00:39:08 UTC (rev 6719)
@@ -31,6 +31,7 @@
 INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(CPPUNIT_INCLUDES)
 
 EXTRA_DIST =                                   \
+       atsci_viterbi_gen.cc                    \
        gen_encoder.py                          \
        qa_atsci_trellis_encoder_t1_input.dat   \
        qa_atsci_trellis_encoder_t1_output.dat  \
@@ -190,14 +191,13 @@
 # programs we build but don't install
 # FIXME add test_atsc
 noinst_PROGRAMS =                              \
-       atsci_viterbi_gen                       \
        test_atsci                              
 
 
-atsci_viterbi_gen_SOURCES = atsci_viterbi_gen.cc
+atsci_viterbi_gen$(EXEEXT): $(srcdir)/atsci_viterbi_gen.cc
+       $(CXX_FOR_BUILD) -O2 $(srcdir)/atsci_viterbi_gen.cc -o 
atsci_viterbi_gen$(EXEEXT)
 
 atsci_viterbi_mux.cc: atsci_viterbi_gen$(EXEEXT) 
-       $(MAKE) $(AM_MAKEFLAGS) CXX="$(CXX_FOR_BUILD)" 
atsci_viterbi_gen$(EXEEXT)
        ./atsci_viterbi_gen$(EXEEXT) -o atsci_viterbi_mux.cc