commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r7639 - in gnuradio/branches/developers/michaelld/buil

From: michaelld
Subject: [Commit-gnuradio] r7639 - in gnuradio/branches/developers/michaelld/build_config: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/io gnuradio-core/src/lib/reed-solomon gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/tests gnuradio-examples/c++/dial_tone gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-gsm-fr-vocoder/src/lib/gsm gr-howto-write-a-block/src/lib gr-pager/src gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src mblock/src/lib omnithread pmt/src/lib usrp/firmware/lib usrp/firmware/src/usrp2 usrp/host/apps usrp/host/apps-inband usrp/host/lib/inband usrp/host/lib/legacy usrp/host/swig
Date: Mon, 11 Feb 2008 20:52:49 -0700 (MST) 
Author: michaelld
Date: 2008-02-11 20:52:46 -0700 (Mon, 11 Feb 2008)
New Revision: 7639

Modified:
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/filter/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/general/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/gengen/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/io/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/reed-solomon/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/runtime/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/swig/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/tests/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gnuradio-examples/c++/dial_tone/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-atsc/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-audio-alsa/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-audio-jack/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-audio-oss/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-audio-osx/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-audio-portaudio/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-audio-windows/src/Makefile.am
   gnuradio/branches/developers/michaelld/build_config/gr-comedi/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-cvsd-vocoder/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-gpio/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-gsm-fr-vocoder/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-howto-write-a-block/src/lib/Makefile.am
   gnuradio/branches/developers/michaelld/build_config/gr-pager/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-radio-astronomy/src/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-trellis/src/lib/Makefile.am
   gnuradio/branches/developers/michaelld/build_config/gr-usrp/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/gr-video-sdl/src/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/mblock/src/lib/Makefile.am
   gnuradio/branches/developers/michaelld/build_config/omnithread/Makefile.am
   gnuradio/branches/developers/michaelld/build_config/pmt/src/lib/Makefile.am
   gnuradio/branches/developers/michaelld/build_config/run_tests.sh.in
   
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/src/usrp2/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/usrp/host/apps-inband/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/usrp/host/apps/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/usrp/host/lib/inband/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/usrp/host/lib/legacy/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/usrp/host/swig/Makefile.am
Log:
In AM Makefiles, changes INCLUDES to AM_CPPFLAGS since the former is
deprecated.

In top-level run_tests.sh.in file, added inclusion of local (to
running script) paths for library search paths in Darwin/OSX and
Windows/Cygwin.  This will be used when splitting C++ object libraries
and Python libraries, and does no harm now.



Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/filter/Makefile.am
        2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/filter/Makefile.am
        2008-02-12 03:52:46 UTC (rev 7639)
@@ -26,7 +26,7 @@
 # other performance critical items
 #
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 noinst_LTLIBRARIES = libfilter.la libfilter-qa.la
 

Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/general/Makefile.am
       2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/general/Makefile.am
       2008-02-12 03:52:46 UTC (rev 7639)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 noinst_LTLIBRARIES = libgeneral.la libgeneral-qa.la
 

Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/gengen/Makefile.am
        2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/gengen/Makefile.am
        2008-02-12 03:52:46 UTC (rev 7639)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 #noinst_LTLIBRARIES = libgengen.la libgengen-qa.la
 noinst_LTLIBRARIES = libgengen.la

Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/io/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/io/Makefile.am
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/io/Makefile.am
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
 
 noinst_LTLIBRARIES = libio.la
 

Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/reed-solomon/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/reed-solomon/Makefile.am
  2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/reed-solomon/Makefile.am
  2008-02-12 03:52:46 UTC (rev 7639)
@@ -25,7 +25,7 @@
 # If you need the int versions too, please figure out how to add them 
*cleanly* to 
 # this Makefile.am.
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 TESTS = rstest
 

Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/runtime/Makefile.am
       2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/runtime/Makefile.am
       2008-02-12 03:52:46 UTC (rev 7639)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 noinst_LTLIBRARIES = libruntime.la libruntime-qa.la
 

Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/swig/Makefile.am
  2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/lib/swig/Makefile.am
  2008-02-12 03:52:46 UTC (rev 7639)
@@ -28,7 +28,7 @@
 grgrpythondir = $(grpythondir)/gr
 grgrlibdir    = $(grpyexecdir)/gr
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \
         $(WITH_INCLUDES)
 
 EXTRA_DIST = gen-swig-bug-fix
@@ -69,7 +69,7 @@
        gnuradio_swig_py_io.h           \
        gnuradio_swig_bug_workaround.h  
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \
        $(WITH_INCLUDES)
 
 # ----------------------------------------------------------------

Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/tests/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/tests/Makefile.am
     2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-core/src/tests/Makefile.am
     2008-02-12 03:52:46 UTC (rev 7639)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 # list of programs run by "make check" and "make distcheck"
 

Modified: 
gnuradio/branches/developers/michaelld/build_config/gnuradio-examples/c++/dial_tone/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gnuradio-examples/c++/dial_tone/Makefile.am
     2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gnuradio-examples/c++/dial_tone/Makefile.am
     2008-02-12 03:52:46 UTC (rev 7639)
@@ -22,7 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 # For compiling within the GNU Radio build tree
-INCLUDES=$(STD_DEFINES_AND_INCLUDES) \
+AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \
          -I$(top_srcdir)/gr-audio-alsa/src \
         $(WITH_INCLUDES)
 
@@ -31,10 +31,10 @@
 # For compiling outside the tree, these will get fished out by pkgconfig
 
 noinst_PROGRAMS = dial_tone
-    
+
 noinst_HEADERS = \
     dial_tone.h
-        
+
 dial_tone_SOURCES = \
     dial_tone.cc          \
     main.cc

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-atsc/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-atsc/src/lib/Makefile.am 
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-atsc/src/lib/Makefile.am 
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -28,7 +28,7 @@
 ourpythondir = $(grpythondir)
 ourlibdir    = $(grpyexecdir)
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
        $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 EXTRA_DIST =                                   \

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-audio-alsa/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-audio-alsa/src/Makefile.am
   2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-audio-alsa/src/Makefile.am
   2008-02-12 03:52:46 UTC (rev 7639)
@@ -49,7 +49,7 @@
 ourpython_PYTHON =                     \
        audio_alsa.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-audio-jack/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-audio-jack/src/Makefile.am
   2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-audio-jack/src/Makefile.am
   2008-02-12 03:52:46 UTC (rev 7639)
@@ -49,7 +49,7 @@
 ourpython_PYTHON =                     \
        audio_jack.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-audio-oss/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-audio-oss/src/Makefile.am
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-audio-oss/src/Makefile.am
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -48,7 +48,7 @@
 ourpython_PYTHON =                     \
        audio_oss.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-audio-osx/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-audio-osx/src/Makefile.am
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-audio-osx/src/Makefile.am
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -48,7 +48,7 @@
 ourpython_PYTHON =                     \
        audio_osx.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \
         $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-audio-portaudio/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-audio-portaudio/src/Makefile.am
      2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-audio-portaudio/src/Makefile.am
      2008-02-12 03:52:46 UTC (rev 7639)
@@ -49,7 +49,7 @@
 ourpython_PYTHON =                     \
        audio_portaudio.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
        $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-audio-windows/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-audio-windows/src/Makefile.am
        2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-audio-windows/src/Makefile.am
        2008-02-12 03:52:46 UTC (rev 7639)
@@ -48,7 +48,7 @@
 ourpython_PYTHON =                     \
        audio_windows.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \
         $(WITH_SWIG_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-comedi/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-comedi/src/Makefile.am   
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-comedi/src/Makefile.am   
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -49,7 +49,7 @@
 ourpython_PYTHON =                     \
        comedi.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGCPPPYTHONARGS = -c++ -python $(PYTHON_CPPFLAGS) \
        $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-cvsd-vocoder/src/lib/Makefile.am
     2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-cvsd-vocoder/src/lib/Makefile.am
     2008-02-12 03:52:46 UTC (rev 7639)
@@ -28,7 +28,7 @@
 ourpythondir = $(grpythondir)/vocoder
 ourlibdir    = $(grpyexecdir)/vocoder
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-gpio/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-gpio/src/lib/Makefile.am 
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-gpio/src/lib/Makefile.am 
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -24,7 +24,7 @@
 ourpythondir = $(grpythondir)/gpio
 ourlibdir    = $(grpyexecdir)/gpio
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
     $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-gsm-fr-vocoder/src/lib/Makefile.am
   2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-gsm-fr-vocoder/src/lib/Makefile.am
   2008-02-12 03:52:46 UTC (rev 7639)
@@ -30,7 +30,7 @@
 ourpythondir = $(grpythondir)/vocoder
 ourlibdir    = $(grpyexecdir)/vocoder
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
       2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
       2008-02-12 03:52:46 UTC (rev 7639)
@@ -43,7 +43,7 @@
 
 OPTIONS = $(SASR) $(MULHACK) $(FAST) $(LTP_CUT)
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 \
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 \
        $(OPTIONS) $(WITH_INCLUDES)
 
 noinst_LTLIBRARIES = libgsm.la

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-howto-write-a-block/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-howto-write-a-block/src/lib/Makefile.am
      2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-howto-write-a-block/src/lib/Makefile.am
      2008-02-12 03:52:46 UTC (rev 7639)
@@ -28,7 +28,7 @@
 ourpythondir = $(grpythondir)
 ourlibdir    = $(grpyexecdir)
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS) $(WITH_SWIG_INCLUDES) \
        $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-pager/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-pager/src/Makefile.am    
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-pager/src/Makefile.am    
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -43,7 +43,7 @@
 ourpythondir = $(grpythondir)/pager
 ourlibdir    = $(grpyexecdir)/pager
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-radio-astronomy/src/lib/Makefile.am
  2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-radio-astronomy/src/lib/Makefile.am
  2008-02-12 03:52:46 UTC (rev 7639)
@@ -28,7 +28,7 @@
 ourpythondir = $(grpythondir)
 ourlibdir    = $(grpyexecdir)
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-trellis/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-trellis/src/lib/Makefile.am
  2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-trellis/src/lib/Makefile.am
  2008-02-12 03:52:46 UTC (rev 7639)
@@ -28,7 +28,7 @@
 ourpythondir = $(grpythondir)
 ourlibdir    = $(grpyexecdir)
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/build_config/gr-usrp/src/Makefile.am 
2008-02-12 01:49:13 UTC (rev 7638)
+++ gnuradio/branches/developers/michaelld/build_config/gr-usrp/src/Makefile.am 
2008-02-12 03:52:46 UTC (rev 7639)
@@ -61,7 +61,7 @@
         usrp_multi.py                  
 
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES)  \
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)  \
           $(PYTHON_CPPFLAGS)           \
           $(USRP_INCLUDES)             \
           $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/gr-video-sdl/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/gr-video-sdl/src/Makefile.am
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/gr-video-sdl/src/Makefile.am
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -48,7 +48,7 @@
 ourpython_PYTHON =                     \
        video_sdl.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
        $(WITH_INCLUDES)
 
 SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) 
$(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/mblock/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/mblock/src/lib/Makefile.am  
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/mblock/src/lib/Makefile.am  
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) \
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) \
        $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 # disable test until we fix ticket:180

Modified: 
gnuradio/branches/developers/michaelld/build_config/omnithread/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/build_config/omnithread/Makefile.am  
2008-02-12 01:49:13 UTC (rev 7638)
+++ gnuradio/branches/developers/michaelld/build_config/omnithread/Makefile.am  
2008-02-12 03:52:46 UTC (rev 7639)
@@ -27,7 +27,7 @@
 # we should do some configure hacking to determine these on the fly
 OMNITHREAD_DEFINES = -DPthreadDraftVersion=10
 
-INCLUDES = $(DEFINES) $(OMNITHREAD_DEFINES) $(OMNITHREAD_INCLUDES) \
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_DEFINES) $(OMNITHREAD_INCLUDES) \
         $(WITH_INCLUDES)
 
 # we call it libgromnithread to avoid a collision with libomnithread on Debian

Modified: 
gnuradio/branches/developers/michaelld/build_config/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/build_config/pmt/src/lib/Makefile.am 
2008-02-12 01:49:13 UTC (rev 7638)
+++ gnuradio/branches/developers/michaelld/build_config/pmt/src/lib/Makefile.am 
2008-02-12 03:52:46 UTC (rev 7639)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(BOOST_CFLAGS) \
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(BOOST_CFLAGS) \
        $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 TESTS = test_pmt

Modified: gnuradio/branches/developers/michaelld/build_config/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/michaelld/build_config/run_tests.sh.in 
2008-02-12 01:49:13 UTC (rev 7638)
+++ gnuradio/branches/developers/michaelld/build_config/run_tests.sh.in 
2008-02-12 03:52:46 UTC (rev 7639)
@@ -75,47 +75,46 @@
     fi
 done
 
-# Add the grlibdir paths to the front of any PATH variable
+# Add 'mylibdir' to the start of the library load path, to get local
+# (to this component) created libraries
+
+# For OS/X
+if [ "$DYLD_LIBRARY_PATH" = "" ]
+then
+    DYLD_LIBRARY_PATH=$mylibdir
+else
+    DYLD_LIBRARY_PATH=$mylibdir:$DYLD_LIBRARY_PATH
+fi
+
+# For Win32
+if [ "$PATH" = "" ]
+then
+    PATH=$mylibdir
+else
+    PATH=$mylibdir:$PATH
+fi
+
+# DYLD_LIBRARY_PATH and PATH will not be empty now
+
+# Add the grlibdir paths to the front of any library load variable
 if [ "$grlibdir" != "" ]
 then
     # For OS/X
-    if [ "$DYLD_LIBRARY_PATH" = "" ]
-    then
-       DYLD_LIBRARY_PATH=$grlibdir
-    else
-       DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
-    fi
-
+    DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
     # For Win32
-    if [ "$PATH" = "" ]
-    then
-       PATH=$grlibdir
-    else
-       PATH=$grlibdir:$PATH
-    fi
+    PATH=$grlibdir:$PATH
 fi
 
 # Where to find pre-installed libraries
 address@hidden@
 
-# Add the withdirs paths to the end of any PATH variable
+# Add the withdirs paths to the end of any library load variable
 if [ "$withlibdirs" != "" ]
 then
     # For OS/X
-    if [ "$DYLD_LIBRARY_PATH" = "" ]
-    then
-       DYLD_LIBRARY_PATH=$withlibdirs
-    else
-       DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs
-    fi
-
+    DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs
     # For Win32
-    if [ "$PATH" = "" ]
-    then
-       PATH=$withlibdirs
-    else
-       PATH=$PATH:$withlibdirs
-    fi
+    PATH=$PATH:$withlibdirs
 fi
 
 export DYLD_LIBRARY_PATH

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/lib/Makefile.am
   2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/lib/Makefile.am
   2008-02-12 03:52:46 UTC (rev 7639)
@@ -30,7 +30,7 @@
 
 
 DEFINES=
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include
+AM_CPPFLAGS=-I$(top_srcdir)/usrp/firmware/include
 
 # with EA = 0, the FX2 implements a portion of the 8051 "external memory"
 # on chip.  This memory is mapped like this:
@@ -58,7 +58,7 @@
 all: libfx2.lib
 
 .c.rel:
-       $(XCC) $(INCLUDES) $(DEFINES) -c $< -o $@
+       $(XCC) $(AM_CPPFLAGS) $(DEFINES) -c $< -o $@
 
 $(LIBRARY): $(LIBOBJS)
        -rm -f $(LIBRARY)

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/src/usrp2/Makefile.am
     2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/src/usrp2/Makefile.am
     2008-02-12 03:52:46 UTC (rev 7639)
@@ -54,7 +54,7 @@
 
 
 DEFINES=-DHAVE_USRP2
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
+AM_CPPFLAGS=-I$(top_srcdir)/usrp/firmware/include \
          -I$(top_srcdir)/usrp/firmware/src/usrp2 \
         -I$(top_srcdir)/usrp/firmware/src/common \
         -I$(top_builddir)/usrp/firmware/src/common
@@ -91,7 +91,7 @@
 
 
 .c.rel:
-       $(XCC) $(INCLUDES) $(DEFINES) \
+       $(XCC) $(AM_CPPFLAGS) $(DEFINES) \
                -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
 .a51.rel:

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/host/apps/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/host/apps/Makefile.am  
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/host/apps/Makefile.am  
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
+AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
           $(WITH_INCLUDES)
 
 bin_PROGRAMS =                         \

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/host/apps-inband/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/host/apps-inband/Makefile.am
       2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/host/apps-inband/Makefile.am
       2008-02-12 03:52:46 UTC (rev 7639)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES =     \
+AM_CPPFLAGS =  \
        $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
        $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) \
        $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/host/lib/inband/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/host/lib/inband/Makefile.am
        2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/host/lib/inband/Makefile.am
        2008-02-12 03:52:46 UTC (rev 7639)
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES =     \
+AM_CPPFLAGS =  \
        $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
        $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
        -I$(srcdir)/../../apps-inband $(WITH_INCLUDES)

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/host/lib/legacy/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/host/lib/legacy/Makefile.am
        2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/host/lib/legacy/Makefile.am
        2008-02-12 03:52:46 UTC (rev 7639)
@@ -32,10 +32,10 @@
 
 # darwin fusb requires omnithreads
 if FUSB_TECH_darwin
-INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(WITH_INCLUDES)
 libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
 else
-INCLUDES = $(common_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(common_INCLUDES) $(WITH_INCLUDES)
 libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
 endif
 

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/host/swig/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/host/swig/Makefile.am  
    2008-02-12 01:49:13 UTC (rev 7638)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/host/swig/Makefile.am  
    2008-02-12 03:52:46 UTC (rev 7639)
@@ -25,7 +25,7 @@
 ourlibdir    = $(usrppyexecdir)
 
 
-INCLUDES = $(USRP_INCLUDES)            \
+AM_CPPFLAGS = $(USRP_INCLUDES)                 \
           $(PYTHON_CPPFLAGS)           \
           -I$(srcdir)                  \
           $(WITH_INCLUDES)
@@ -53,7 +53,7 @@
        usrp_prims.py                   
 
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \
        $(WITH_INCLUDES)
reply via email to
[Prev in Thread] Current Thread [Next in Thread]