[Commit-gnuradio] r10595 - in gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block: . config

[michaelld]

Author: michaelld
Date: 2009-03-13 18:56:25 -0600 (Fri, 13 Mar 2009)
New Revision: 10595

Modified:
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config/gr_standalone.m4
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/configure.ac
Log:
Better solution to CxxFLAGS split between SWIG and CXX-compile.



Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
     2009-03-13 20:52:55 UTC (rev 10594)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
     2009-03-14 00:56:25 UTC (rev 10595)
@@ -20,16 +20,28 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+# these flags are used when compiling non-SWIG-wrapper files
+# when going in to non-SWIG libraries
 AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
-AM_CPPFLAGS = $(GNURADIO_CORE_CFLAGS) $(PYTHON_CPPFLAGS)
 
+# these flags are used when compiling any CXX file
+AM_CPPFLAGS = \
+       $(STD_DEFINES_AND_INCLUDES) \
+       $(PYTHON_CPPFLAGS) \
+       $(CPPUNIT_INCLUDES) \
+       $(GNURADIO_CORE_CPPFLAGS)
+
+# these are used by both SWIG and CXX
+STD_DEFINES_AND_INCLUDES = \
+       $(DEFINES) \
+       -I$(GNURADIO_CORE_INCLUDEDIR) \
+       -I$(GNURADIO_CORE_INCLUDEDIR)/swig
+
 # includes
 grincludedir = $(includedir)/gnuradio
-WITH_INCLUDES = -I$(GNURADIO_CORE_INCLUDEDIR)
 
 # swig includes 
 swigincludedir = $(grincludedir)/swig
-WITH_SWIG_INCLUDES = -I$(GNURADIO_CORE_INCLUDEDIR)/swig
 
 # Install this stuff in the appropriate subdirectory
 # This usually ends up at:

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config/gr_standalone.m4
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config/gr_standalone.m4
     2009-03-13 20:52:55 UTC (rev 10594)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/config/gr_standalone.m4
     2009-03-14 00:56:25 UTC (rev 10595)
@@ -1,5 +1,5 @@
 dnl
-dnl Copyright 2008 Free Software Foundation, Inc.
+dnl Copyright 2008,2009 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -98,13 +98,6 @@
   GR_NO_UNDEFINED      dnl do we need the -no-undefined linker flag
   GR_SCRIPTING         dnl Locate python, SWIG, etc
 
-  dnl Set the c++ compiler that we use for the build system when cross 
compiling
-  if test "x$CXX_FOR_BUILD" = x
-  then
-    CXX_FOR_BUILD=${CXX}
-  fi
-  AC_SUBST(CXX_FOR_BUILD)
-
   dnl Checks for header files.
   AC_HEADER_STDC
 

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/configure.ac
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/configure.ac
        2009-03-13 20:52:55 UTC (rev 10594)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/configure.ac
        2009-03-14 00:56:25 UTC (rev 10595)
@@ -59,10 +59,6 @@
 dnl AX_BOOST_UNIT_TEST_FRAMEWORK
 dnl AX_BOOST_WSERIALIZATION
 
-
-dnl STD_DEFINES_AND_INCLUDES="$GNURADIO_CORE_CFLAGS"
-dnl AC_SUBST(STD_DEFINES_AND_INCLUDES)
- 
 AC_CONFIG_FILES([\
          Makefile \
          config/Makefile \