[Commit-gnuradio] r4253 - in gnuradio/branches/developers/eb/swig-split: . gnuradio-core/src/lib/swig

[eb]

Author: eb
Date: 2007-01-12 19:56:47 -0700 (Fri, 12 Jan 2007)
New Revision: 4253

Modified:
   gnuradio/branches/developers/eb/swig-split/Makefile.common
   gnuradio/branches/developers/eb/swig-split/configure.ac
   
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/Makefile.am
Log:
Now use -g1 -O1 when compiling swig output with g++.  This cuts the
compile time down to 60% of what it used to be.


Modified: gnuradio/branches/developers/eb/swig-split/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/swig-split/Makefile.common  2007-01-12 
20:32:37 UTC (rev 4252)
+++ gnuradio/branches/developers/eb/swig-split/Makefile.common  2007-01-13 
02:56:47 UTC (rev 4253)
@@ -20,6 +20,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
+
 # includes
 grincludedir   = $(includedir)/gnuradio
 

Modified: gnuradio/branches/developers/eb/swig-split/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/swig-split/configure.ac     2007-01-12 
20:32:37 UTC (rev 4252)
+++ gnuradio/branches/developers/eb/swig-split/configure.ac     2007-01-13 
02:56:47 UTC (rev 4253)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -25,9 +25,34 @@
 AM_INIT_AUTOMAKE(gnuradio,3.0svn)
 AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
 
+dnl Remember if the user explicity set CXXFLAGS
+if test -n "${CXXFLAGS}"; then
+  user_set_cxxflags=yes
+fi
+
 GR_X86_64              dnl check for lib64 suffix
 LF_CONFIGURE_CC
 LF_CONFIGURE_CXX
+
+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
+dnl selected files.  Thus we "undo" the damage here...
+dnl 
+dnl If the user specified CXXFLAGS, we use them.  Otherwise when compiling
+dnl the output of swig use use -O1 if we're using g++.
+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
+    swig_CXXFLAGS="-g1 -O1"
+  fi
+fi
+AC_SUBST(autoconf_default_CXXFLAGS)
+AC_SUBST(swig_CXXFLAGS)
+
+
 LF_SET_WARNINGS
 GR_SET_GPROF
 GR_SET_PROF

Modified: 
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/Makefile.am
   2007-01-12 20:32:37 UTC (rev 4252)
+++ 
gnuradio/branches/developers/eb/swig-split/gnuradio-core/src/lib/swig/Makefile.am
   2007-01-13 02:56:47 UTC (rev 4253)
@@ -79,7 +79,7 @@
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
 
 # ----------------------------------------------------------------
-# We break this up into 4 libraries...
+# We break this up into 5 libraries...
 
 grgrlib_LTLIBRARIES =                          \
        _gnuradio_swig_py_runtime.la            \
@@ -97,6 +97,16 @@
        gnuradio_swig_py_filter.py      \
        gnuradio_swig_py_io.py          
 
+
+# This results in the code being compiled with -O1 instead of -g -O2
+
+_gnuradio_swig_py_runtime_la_CXXFLAGS = @swig_CXXFLAGS@
+_gnuradio_swig_py_general_la_CXXFLAGS = @swig_CXXFLAGS@
+_gnuradio_swig_py_gengen_la_CXXFLAGS  = @swig_CXXFLAGS@
+_gnuradio_swig_py_filter_la_CXXFLAGS  = @swig_CXXFLAGS@
+_gnuradio_swig_py_io_la_CXXFLAGS      = @swig_CXXFLAGS@
+
+
 # ----------------------------------------------------------------
 # Part 1: gnuradio.i -> gnuradio_swig_py_runtime
 #