From 776da31eb84e146a8adf1e3ca7e017c1d9992ce3 Mon Sep 17 00:00:00 2001 From: michaelld Date: Thu, 21 Feb 2008 19:16:45 +0000 Subject: [PATCH] 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. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7769 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/filter/Makefile.am | 2 +- gnuradio-core/src/lib/general/Makefile.am | 2 +- gnuradio-core/src/lib/gengen/Makefile.am | 2 +- gnuradio-core/src/lib/io/Makefile.am | 2 +- .../src/lib/reed-solomon/Makefile.am | 2 +- gnuradio-core/src/lib/runtime/Makefile.am | 2 +- gnuradio-core/src/lib/swig/Makefile.am | 4 +- gnuradio-core/src/tests/Makefile.am | 2 +- gnuradio-examples/c++/dial_tone/Makefile.am | 6 +- gr-atsc/src/lib/Makefile.am | 2 +- gr-audio-alsa/src/Makefile.am | 2 +- gr-audio-jack/src/Makefile.am | 2 +- gr-audio-oss/src/Makefile.am | 2 +- gr-audio-osx/src/Makefile.am | 2 +- gr-audio-portaudio/src/Makefile.am | 2 +- gr-audio-windows/src/Makefile.am | 2 +- gr-comedi/src/Makefile.am | 2 +- gr-cvsd-vocoder/src/lib/Makefile.am | 2 +- gr-gpio/src/lib/Makefile.am | 2 +- gr-gsm-fr-vocoder/src/lib/Makefile.am | 2 +- gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am | 2 +- gr-howto-write-a-block/src/lib/Makefile.am | 2 +- gr-pager/src/Makefile.am | 2 +- gr-radio-astronomy/src/lib/Makefile.am | 2 +- gr-trellis/src/lib/Makefile.am | 2 +- gr-usrp/src/Makefile.am | 2 +- gr-video-sdl/src/Makefile.am | 2 +- mblock/src/lib/Makefile.am | 2 +- omnithread/Makefile.am | 2 +- pmt/src/lib/Makefile.am | 2 +- run_tests.sh.in | 66 ++++++++++--------- usrp/firmware/lib/Makefile.am | 4 +- usrp/firmware/src/usrp2/Makefile.am | 4 +- usrp/host/apps-inband/Makefile.am | 2 +- usrp/host/apps/Makefile.am | 2 +- usrp/host/lib/inband/Makefile.am | 2 +- usrp/host/lib/legacy/Makefile.am | 4 +- usrp/host/swig/Makefile.am | 4 +- 38 files changed, 80 insertions(+), 74 deletions(-) diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am index 22d5aa07..93834d74 100644 --- a/gnuradio-core/src/lib/filter/Makefile.am +++ b/gnuradio-core/src/lib/filter/Makefile.am @@ -26,7 +26,7 @@ include $(top_srcdir)/Makefile.common # 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 diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index bc94d3b0..8a16692b 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -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 diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index 5282ad66..b142905b 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -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 diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am index c9468373..c307be13 100644 --- a/gnuradio-core/src/lib/io/Makefile.am +++ b/gnuradio-core/src/lib/io/Makefile.am @@ -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 diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.am b/gnuradio-core/src/lib/reed-solomon/Makefile.am index 18208188..b7bd939b 100644 --- a/gnuradio-core/src/lib/reed-solomon/Makefile.am +++ b/gnuradio-core/src/lib/reed-solomon/Makefile.am @@ -25,7 +25,7 @@ include $(top_srcdir)/Makefile.common # 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 diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am index f6b744e4..d84128cb 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.am +++ b/gnuradio-core/src/lib/runtime/Makefile.am @@ -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 diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 8c77d39b..d3060e9d 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.common 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 @@ BUILT_SOURCES = \ 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) # ---------------------------------------------------------------- diff --git a/gnuradio-core/src/tests/Makefile.am b/gnuradio-core/src/tests/Makefile.am index b3bd8688..01e35120 100644 --- a/gnuradio-core/src/tests/Makefile.am +++ b/gnuradio-core/src/tests/Makefile.am @@ -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" diff --git a/gnuradio-examples/c++/dial_tone/Makefile.am b/gnuradio-examples/c++/dial_tone/Makefile.am index d1ac268d..aaa7e1ef 100644 --- a/gnuradio-examples/c++/dial_tone/Makefile.am +++ b/gnuradio-examples/c++/dial_tone/Makefile.am @@ -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 @@ GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la # 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 diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index 96e55a63..256cf768 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.common 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 = \ diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index e82eda4f..2b73c7b1 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -49,7 +49,7 @@ BUILT_SOURCES = \ 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) diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index 2c13a835..199382f5 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/Makefile.am @@ -49,7 +49,7 @@ BUILT_SOURCES = \ 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) diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am index f2f173b5..621aae16 100644 --- a/gr-audio-oss/src/Makefile.am +++ b/gr-audio-oss/src/Makefile.am @@ -48,7 +48,7 @@ BUILT_SOURCES = \ 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) diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am index b9ac0cb6..6bfbaa4e 100644 --- a/gr-audio-osx/src/Makefile.am +++ b/gr-audio-osx/src/Makefile.am @@ -48,7 +48,7 @@ BUILT_SOURCES = \ 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) diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index 3b55969a..fc00b7e2 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.am @@ -49,7 +49,7 @@ BUILT_SOURCES = \ 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) \ diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index 7b610440..3dc30da1 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -48,7 +48,7 @@ BUILT_SOURCES = \ 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) diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index 05c3780b..00e14c77 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -49,7 +49,7 @@ BUILT_SOURCES = \ 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) diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am index 67126db7..402a10ee 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.am +++ b/gr-cvsd-vocoder/src/lib/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.common 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) diff --git a/gr-gpio/src/lib/Makefile.am b/gr-gpio/src/lib/Makefile.am index 0de45d78..f05a581a 100644 --- a/gr-gpio/src/lib/Makefile.am +++ b/gr-gpio/src/lib/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common 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) diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index bbfbf8f8..a53813c6 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -30,7 +30,7 @@ SUBDIRS = gsm . 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) diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am index d72eb896..d0872ff3 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am @@ -43,7 +43,7 @@ LTP_CUT = 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 diff --git a/gr-howto-write-a-block/src/lib/Makefile.am b/gr-howto-write-a-block/src/lib/Makefile.am index 942bd504..3a0a0a3f 100644 --- a/gr-howto-write-a-block/src/lib/Makefile.am +++ b/gr-howto-write-a-block/src/lib/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.common 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) diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am index f9575262..5c70db2f 100644 --- a/gr-pager/src/Makefile.am +++ b/gr-pager/src/Makefile.am @@ -43,7 +43,7 @@ noinst_PYTHON = \ 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) diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am index a06d1e64..f3351bf8 100644 --- a/gr-radio-astronomy/src/lib/Makefile.am +++ b/gr-radio-astronomy/src/lib/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.common 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) diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index a7cfbc32..d18fad8d 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.common 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) diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 26b7043a..a2b348e3 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -61,7 +61,7 @@ ourpython_PYTHON = \ usrp_multi.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) \ +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ $(USRP_INCLUDES) \ $(WITH_INCLUDES) diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am index 4e64ae2e..a471eacd 100644 --- a/gr-video-sdl/src/Makefile.am +++ b/gr-video-sdl/src/Makefile.am @@ -48,7 +48,7 @@ BUILT_SOURCES = \ 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) diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am index 17f421d9..4bdd9b1a 100644 --- a/mblock/src/lib/Makefile.am +++ b/mblock/src/lib/Makefile.am @@ -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 diff --git a/omnithread/Makefile.am b/omnithread/Makefile.am index 59ba971a..0985f4ed 100644 --- a/omnithread/Makefile.am +++ b/omnithread/Makefile.am @@ -27,7 +27,7 @@ include $(top_srcdir)/Makefile.common # 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 diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am index cb1a907f..1ea67028 100644 --- a/pmt/src/lib/Makefile.am +++ b/pmt/src/lib/Makefile.am @@ -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 diff --git a/run_tests.sh.in b/run_tests.sh.in index 1562eeec..35e24d79 100644 --- a/run_tests.sh.in +++ b/run_tests.sh.in @@ -75,50 +75,56 @@ do fi done -# Add the grlibdir paths to the front of any PATH 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 - - # For Win32 - if [ "$PATH" = "" ] - then - PATH=$grlibdir - else - PATH=$grlibdir:$PATH - fi -fi +# Add 'mylibdir' to the start of the library load path, to get local +# (to this component) created libraries # Where to find pre-installed libraries withlibdirs=@with_LIBDIRPATH@ -# Add the withdirs paths to the end of any PATH variable -if [ "$withlibdirs" != "" ] -then - # For OS/X +case "@host_os@" in + darwin*) + # Special Code for executing on Darwin / Mac OS X only if [ "$DYLD_LIBRARY_PATH" = "" ] then - DYLD_LIBRARY_PATH=$withlibdirs + 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 + # Add the withdirs paths to the end of any library load variable + if [ "$withlibdirs" != "" ] + then DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs fi - - # For Win32 + export DYLD_LIBRARY_PATH + ;; + cygwin*|win*|mingw*) + # Special Code for executing on Win32 variants only if [ "$PATH" = "" ] then - PATH=$withlibdirs + PATH=$mylibdir else + PATH=$mylibdir:$PATH + fi + # PATH will not be empty now + # Add the grlibdir paths to the front of any library load variable + if [ "$grlibdir" != "" ] + then + PATH=$grlibdir:$PATH + fi + # Add the withdirs paths to the end of any library load variable + if [ "$withlibdirs" != "" ] + then PATH=$PATH:$withlibdirs fi -fi - -export DYLD_LIBRARY_PATH + export PATH + ;; +esac # Don't load user or system prefs GR_DONT_LOAD_PREFS=1 diff --git a/usrp/firmware/lib/Makefile.am b/usrp/firmware/lib/Makefile.am index eb42f55e..a6790f01 100644 --- a/usrp/firmware/lib/Makefile.am +++ b/usrp/firmware/lib/Makefile.am @@ -30,7 +30,7 @@ EXTRA_DIST = \ 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 @@ LIBOBJS = \ all: libfx2.lib .c.rel: - $(XCC) $(INCLUDES) $(DEFINES) -c $< -o $@ + $(XCC) $(FW_INCLUDES) $(DEFINES) -c $< -o $@ $(LIBRARY): $(LIBOBJS) -rm -f $(LIBRARY) diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am index 3f5b74f7..e380b190 100644 --- a/usrp/firmware/src/usrp2/Makefile.am +++ b/usrp/firmware/src/usrp2/Makefile.am @@ -54,7 +54,7 @@ EXTRA_DIST = \ 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 @@ noinst_SCRIPTS = \ .c.rel: - $(XCC) $(INCLUDES) $(DEFINES) \ + $(XCC) $(FW_INCLUDES) $(DEFINES) \ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .a51.rel: diff --git a/usrp/host/apps-inband/Makefile.am b/usrp/host/apps-inband/Makefile.am index d4ca6607..86bb4061 100644 --- a/usrp/host/apps-inband/Makefile.am +++ b/usrp/host/apps-inband/Makefile.am @@ -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) diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am index cc93d0d3..b3050a7b 100644 --- a/usrp/host/apps/Makefile.am +++ b/usrp/host/apps/Makefile.am @@ -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 = \ diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am index 3a59fd61..77d1f669 100644 --- a/usrp/host/lib/inband/Makefile.am +++ b/usrp/host/lib/inband/Makefile.am @@ -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) diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am index 17b5935e..9714dc3f 100644 --- a/usrp/host/lib/legacy/Makefile.am +++ b/usrp/host/lib/legacy/Makefile.am @@ -32,10 +32,10 @@ libusrp_la_common_LIBADD = \ # 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 diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am index a7c8b08d..dc92f2b4 100644 --- a/usrp/host/swig/Makefile.am +++ b/usrp/host/swig/Makefile.am @@ -25,7 +25,7 @@ ourpythondir = $(usrppythondir) ourlibdir = $(usrppyexecdir) -INCLUDES = $(USRP_INCLUDES) \ +AM_CPPFLAGS = $(USRP_INCLUDES) \ $(PYTHON_CPPFLAGS) \ -I$(srcdir) \ $(WITH_INCLUDES) @@ -53,7 +53,7 @@ ourpython_PYTHON = \ usrp_prims.py -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \ +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \ $(WITH_INCLUDES) -- 2.30.2