[Commit-gnuradio] r11017 - in gnuradio/branches/developers/eb/t364: . config gnuradio-core/src/lib/viterbi usrp/host/misc

[eb]

Author: eb
Date: 2009-05-12 19:39:39 -0600 (Tue, 12 May 2009)
New Revision: 11017

Modified:
   gnuradio/branches/developers/eb/t364/Makefile.common
   gnuradio/branches/developers/eb/t364/config/lf_warnings.m4
   gnuradio/branches/developers/eb/t364/configure.ac
   
gnuradio/branches/developers/eb/t364/gnuradio-core/src/lib/viterbi/Makefile.am
   gnuradio/branches/developers/eb/t364/usrp/host/misc/Makefile.am
Log:
Ready for testing on other machines.  swig warnings are now
suppressed.  We get the correct optimization levels for swig vs
non-swig code.



Modified: gnuradio/branches/developers/eb/t364/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/t364/Makefile.common        2009-05-12 
23:16:52 UTC (rev 11016)
+++ gnuradio/branches/developers/eb/t364/Makefile.common        2009-05-13 
01:39:39 UTC (rev 11017)
@@ -20,7 +20,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-#AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
+AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@
+AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@
 
 # includes
 grincludedir = $(includedir)/gnuradio

Modified: gnuradio/branches/developers/eb/t364/config/lf_warnings.m4
===================================================================
--- gnuradio/branches/developers/eb/t364/config/lf_warnings.m4  2009-05-12 
23:16:52 UTC (rev 11016)
+++ gnuradio/branches/developers/eb/t364/config/lf_warnings.m4  2009-05-13 
01:39:39 UTC (rev 11017)
@@ -22,7 +22,7 @@
 
 # --------------------------------------------------------------------------
 # Check whether the C++ compiler accepts a certain flag
-# If it does it adds the flag to CXXFLAGS
+# If it does it adds the flag to lf_CXXFLAGS
 # If it does not then it returns an error to lf_ok
 # Usage:
 #   LF_CHECK_CXX_FLAG(-flag1 -flag2 -flag3 ...)
@@ -35,18 +35,19 @@
     AC_MSG_CHECKING([whether $CXX accepts $i])
     if test -z "`${CXX} $i -c conftest.cc 2>&1`"
     then
-      CXXFLAGS="${CXXFLAGS} $i"
+      lf_CXXFLAGS="${lf_CXXFLAGS} $i"
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
     fi
   done
   rm -f conftest.cc conftest.o
+  AC_SUBST(lf_CXXFLAGS)
 ])
 
 # --------------------------------------------------------------------------
 # Check whether the C compiler accepts a certain flag
-# If it does it adds the flag to CFLAGS
+# If it does it adds the flag to lf_CFLAGS
 # If it does not then it returns an error to lf_ok
 # Usage:
 #  LF_CHECK_CC_FLAG(-flag1 -flag2 -flag3 ...)
@@ -59,18 +60,19 @@
     AC_MSG_CHECKING([whether $CC accepts $i])
     if test -z "`${CC} $i -c conftest.c 2>&1`"
     then
-      CFLAGS="${CFLAGS} $i"
+      lf_CFLAGS="${lf_CFLAGS} $i"
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
     fi
   done
   rm -f conftest.c conftest.o
+  AC_SUBST(lf_CFLAGS)
 ])
 
 # --------------------------------------------------------------------------
 # Check whether the Fortran compiler accepts a certain flag
-# If it does it adds the flag to FFLAGS
+# If it does it adds the flag to lf_FFLAGS
 # If it does not then it returns an error to lf_ok
 # Usage:
 #  LF_CHECK_F77_FLAG(-flag1 -flag2 -flag3 ...)
@@ -88,13 +90,14 @@
     AC_MSG_CHECKING([whether $F77 accepts $i])
     if test -z "`${F77} $i -c conftest.f 2>&1`"
     then
-      FFLAGS="${FFLAGS} $i"
+      lf_FFLAGS="${lf_FFLAGS} $i"
       AC_MSG_RESULT(yes)  
     else
       AC_MSG_RESULT(no)
     fi
   done
   rm -f conftest.f conftest.o
+  AC_SUBST(lf_FFLAGS)
 ])
 
 # ----------------------------------------------------------------------

Modified: gnuradio/branches/developers/eb/t364/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/t364/configure.ac   2009-05-12 23:16:52 UTC 
(rev 11016)
+++ gnuradio/branches/developers/eb/t364/configure.ac   2009-05-13 01:39:39 UTC 
(rev 11017)
@@ -31,15 +31,35 @@
 DEFINES=""
 AC_SUBST(DEFINES)
 
+dnl Remember if the user explicity set CFLAGS
+if test -n "${CFLAGS}"; then
+  user_set_cflags=yes
+fi
 dnl Remember if the user explicity set CXXFLAGS
 if test -n "${CXXFLAGS}"; then
   user_set_cxxflags=yes
 fi
 
+
 LF_CONFIGURE_CC
 LF_CONFIGURE_CXX
 GR_LIB64               dnl check for lib64 suffix after choosing compilers
 
+
+dnl The three macros above are known to override CFLAGS if the user
+dnl didn't specify them.  Though I'm sure somebody thought this was
+dnl a good idea, it makes it hard to use other than -g -O2 when compiling
+dnl selected files.  Thus we "undo" the damage here...
+dnl 
+dnl If the user specified CFLAGS, we use them.
+dnl See Makefile.common for the rest of the magic.
+if test "$user_set_cflags" != yes; then
+  autoconf_default_CFLAGS="$CFLAGS"
+  CFLAGS=""
+fi
+AC_SUBST(autoconf_default_CFLAGS)
+
+
 dnl The three macros above are known to override CXXFLAGS if the user
 dnl didn't specify them.  Though I'm sure somebody thought this was
 dnl a good idea, it makes it hard to use other than -g -O2 when compiling
@@ -50,6 +70,7 @@
 dnl See Makefile.common for the rest of the magic.
 if test "$user_set_cxxflags" != yes; then
   autoconf_default_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS=""
   if test "$GXX" = yes; then
     case "$host_cpu" in
        powerpc*)

Modified: 
gnuradio/branches/developers/eb/t364/gnuradio-core/src/lib/viterbi/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/t364/gnuradio-core/src/lib/viterbi/Makefile.am  
    2009-05-12 23:16:52 UTC (rev 11016)
+++ 
gnuradio/branches/developers/eb/t364/gnuradio-core/src/lib/viterbi/Makefile.am  
    2009-05-13 01:39:39 UTC (rev 11017)
@@ -17,6 +17,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 LIBS = -lm
 
 noinst_LTLIBRARIES = libviterbi.la
@@ -25,7 +27,7 @@
     metrics.c          \
     tab.c              \
     viterbi.c
-    
+
 noinst_HEADERS =       \
     viterbi.h
 

Modified: gnuradio/branches/developers/eb/t364/usrp/host/misc/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/t364/usrp/host/misc/Makefile.am     
2009-05-12 23:16:52 UTC (rev 11016)
+++ gnuradio/branches/developers/eb/t364/usrp/host/misc/Makefile.am     
2009-05-13 01:39:39 UTC (rev 11017)
@@ -19,6 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST = \
        getopt.c getopt.h \
        gettimeofday.c \