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

[Commit-gnuradio] r7769 - in gnuradio/trunk: . gnuradio-core/src/lib/fil

From: michaelld
Subject: [Commit-gnuradio] r7769 - in gnuradio/trunk: . 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: Thu, 21 Feb 2008 12:16:46 -0700 (MST) 
Author: michaelld
Date: 2008-02-21 12:16:45 -0700 (Thu, 21 Feb 2008)
New Revision: 7769

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
   gnuradio/trunk/gnuradio-core/src/tests/Makefile.am
   gnuradio/trunk/gnuradio-examples/c++/dial_tone/Makefile.am
   gnuradio/trunk/gr-atsc/src/lib/Makefile.am
   gnuradio/trunk/gr-audio-alsa/src/Makefile.am
   gnuradio/trunk/gr-audio-jack/src/Makefile.am
   gnuradio/trunk/gr-audio-oss/src/Makefile.am
   gnuradio/trunk/gr-audio-osx/src/Makefile.am
   gnuradio/trunk/gr-audio-portaudio/src/Makefile.am
   gnuradio/trunk/gr-audio-windows/src/Makefile.am
   gnuradio/trunk/gr-comedi/src/Makefile.am
   gnuradio/trunk/gr-cvsd-vocoder/src/lib/Makefile.am
   gnuradio/trunk/gr-gpio/src/lib/Makefile.am
   gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am
   gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
   gnuradio/trunk/gr-howto-write-a-block/src/lib/Makefile.am
   gnuradio/trunk/gr-pager/src/Makefile.am
   gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am
   gnuradio/trunk/gr-trellis/src/lib/Makefile.am
   gnuradio/trunk/gr-usrp/src/Makefile.am
   gnuradio/trunk/gr-video-sdl/src/Makefile.am
   gnuradio/trunk/mblock/src/lib/Makefile.am
   gnuradio/trunk/omnithread/Makefile.am
   gnuradio/trunk/pmt/src/lib/Makefile.am
   gnuradio/trunk/run_tests.sh.in
   gnuradio/trunk/usrp/firmware/lib/Makefile.am
   gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am
   gnuradio/trunk/usrp/host/apps-inband/Makefile.am
   gnuradio/trunk/usrp/host/apps/Makefile.am
   gnuradio/trunk/usrp/host/lib/inband/Makefile.am
   gnuradio/trunk/usrp/host/lib/legacy/Makefile.am
   gnuradio/trunk/usrp/host/swig/Makefile.am
Log:
Merged build_config branch into trunk:

1) Modified top-level run_tests.sh script:

 a) to execute code for setting or changing the library search path in
    Darwin (DYLD_LIBRARY_PATH) or Windows (PATH) on those host OSs
    only, not on other host OSs.

 b) Added local (to the component making check) library paths to those
    same search paths, since libtool doesn't do it (unlike in Linux).

2) In all AM Makefiles -except those dealing with USRP firmware-,
changes INCLUDES to AM_CPPFLAGS since the former is deprecated.

3) Changed AM_CPPFLAGS to FW_INCLUDES for commands .c.rel in USRP
firmware.



Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am     2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am     2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am    2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am    2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am     2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am     2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gnuradio-core/src/lib/io/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am 2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am 2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/gnuradio-core/src/lib/reed-solomon/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/Makefile.am       
2008-02-21 18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gnuradio-core/src/lib/reed-solomon/Makefile.am       
2008-02-21 19:16:45 UTC (rev 7769)
@@ -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/trunk/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am    2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am    2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am       2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am       2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gnuradio-core/src/tests/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/tests/Makefile.am  2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/gnuradio-core/src/tests/Makefile.am  2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/gnuradio-examples/c++/dial_tone/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/c++/dial_tone/Makefile.am  2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gnuradio-examples/c++/dial_tone/Makefile.am  2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/Makefile.am  2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/gr-atsc/src/lib/Makefile.am  2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/src/Makefile.am        2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/gr-audio-alsa/src/Makefile.am        2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-jack/src/Makefile.am        2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/gr-audio-jack/src/Makefile.am        2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-oss/src/Makefile.am 2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/gr-audio-oss/src/Makefile.am 2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-osx/src/Makefile.am 2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/gr-audio-osx/src/Makefile.am 2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/gr-audio-portaudio/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/Makefile.am   2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/gr-audio-portaudio/src/Makefile.am   2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/gr-audio-windows/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-windows/src/Makefile.am     2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/gr-audio-windows/src/Makefile.am     2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-comedi/src/Makefile.am    2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/gr-comedi/src/Makefile.am    2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-cvsd-vocoder/src/lib/Makefile.am  2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/gr-cvsd-vocoder/src/lib/Makefile.am  2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/gr-gpio/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gpio/src/lib/Makefile.am  2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/gr-gpio/src/lib/Makefile.am  2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am        2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am        2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am    2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am    2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gr-howto-write-a-block/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-howto-write-a-block/src/lib/Makefile.am   2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gr-howto-write-a-block/src/lib/Makefile.am   2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-pager/src/Makefile.am     2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/gr-pager/src/Makefile.am     2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am       2008-02-21 
18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am       2008-02-21 
19:16:45 UTC (rev 7769)
@@ -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/trunk/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/Makefile.am       2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/gr-trellis/src/lib/Makefile.am       2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-usrp/src/Makefile.am      2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/gr-usrp/src/Makefile.am      2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-video-sdl/src/Makefile.am 2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/gr-video-sdl/src/Makefile.am 2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/mblock/src/lib/Makefile.am   2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/mblock/src/lib/Makefile.am   2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/omnithread/Makefile.am
===================================================================
--- gnuradio/trunk/omnithread/Makefile.am       2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/omnithread/Makefile.am       2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/pmt/src/lib/Makefile.am      2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/pmt/src/lib/Makefile.am      2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/run_tests.sh.in
===================================================================
--- gnuradio/trunk/run_tests.sh.in      2008-02-21 18:55:44 UTC (rev 7768)
+++ gnuradio/trunk/run_tests.sh.in      2008-02-21 19:16:45 UTC (rev 7769)
@@ -75,51 +75,57 @@
     fi
 done
 
-# Add the grlibdir paths to the front of any PATH variable
-if [ "$grlibdir" != "" ]
-then
-    # For OS/X
+# Add 'mylibdir' to the start of the library load path, to get local
+# (to this component) created libraries
+
+# Where to find pre-installed libraries
address@hidden@
+
+case "@host_os@" in
+  darwin*)
+    # Special Code for executing on Darwin / Mac OS X only
     if [ "$DYLD_LIBRARY_PATH" = "" ]
     then
-       DYLD_LIBRARY_PATH=$grlibdir
+       DYLD_LIBRARY_PATH=$mylibdir
     else
+       DYLD_LIBRARY_PATH=$mylibdir:$DYLD_LIBRARY_PATH
+    fi
+    # DYLD_LIBRARY_PATH will not be empty now
+    # Add the grlibdir paths to the front of any library load variable
+    if [ "$grlibdir" != "" ]
+    then
        DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
     fi
-
-    # For Win32
+    # Add the withdirs paths to the end of any library load variable
+    if [ "$withlibdirs" != "" ]
+    then
+       DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs
+    fi
+    export DYLD_LIBRARY_PATH
+    ;;
+  cygwin*|win*|mingw*)
+    # Special Code for executing on Win32 variants only
     if [ "$PATH" = "" ]
     then
-       PATH=$grlibdir
+       PATH=$mylibdir
     else
-       PATH=$grlibdir:$PATH
+       PATH=$mylibdir:$PATH
     fi
-fi
-
-# Where to find pre-installed libraries
address@hidden@
-
-# Add the withdirs paths to the end of any PATH variable
-if [ "$withlibdirs" != "" ]
-then
-    # For OS/X
-    if [ "$DYLD_LIBRARY_PATH" = "" ]
+    # PATH will not be empty now
+    # Add the grlibdir paths to the front of any library load variable
+    if [ "$grlibdir" != "" ]
     then
-       DYLD_LIBRARY_PATH=$withlibdirs
-    else
-       DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs
+       PATH=$grlibdir:$PATH
     fi
-
-    # For Win32
-    if [ "$PATH" = "" ]
+    # Add the withdirs paths to the end of any library load variable
+    if [ "$withlibdirs" != "" ]
     then
-       PATH=$withlibdirs
-    else
        PATH=$PATH:$withlibdirs
     fi
-fi
+    export PATH
+    ;;
+esac
 
-export DYLD_LIBRARY_PATH
-
 # Don't load user or system prefs
 GR_DONT_LOAD_PREFS=1
 export GR_DONT_LOAD_PREFS

Modified: gnuradio/trunk/usrp/firmware/lib/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/firmware/lib/Makefile.am        2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/usrp/firmware/lib/Makefile.am        2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -30,7 +30,7 @@
 
 
 DEFINES=
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include
+FW_INCLUDES=-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) $(FW_INCLUDES) $(DEFINES) -c $< -o $@
 
 $(LIBRARY): $(LIBOBJS)
        -rm -f $(LIBRARY)

Modified: gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am  2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am  2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -54,7 +54,7 @@
 
 
 DEFINES=-DHAVE_USRP2
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
+FW_INCLUDES=-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) $(FW_INCLUDES) $(DEFINES) \
                -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
 .a51.rel:

Modified: gnuradio/trunk/usrp/host/apps/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/apps/Makefile.am   2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/usrp/host/apps/Makefile.am   2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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/trunk/usrp/host/apps-inband/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/apps-inband/Makefile.am    2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/usrp/host/apps-inband/Makefile.am    2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/usrp/host/lib/inband/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/lib/inband/Makefile.am     2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/usrp/host/lib/inband/Makefile.am     2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/usrp/host/lib/legacy/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/lib/legacy/Makefile.am     2008-02-21 18:55:44 UTC 
(rev 7768)
+++ gnuradio/trunk/usrp/host/lib/legacy/Makefile.am     2008-02-21 19:16:45 UTC 
(rev 7769)
@@ -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/trunk/usrp/host/swig/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/swig/Makefile.am   2008-02-21 18:55:44 UTC (rev 
7768)
+++ gnuradio/trunk/usrp/host/swig/Makefile.am   2008-02-21 19:16:45 UTC (rev 
7769)
@@ -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]