diff options
| author | jcorgan | 2008-02-08 23:32:10 +0000 |
|---|---|---|
| committer | jcorgan | 2008-02-08 23:32:10 +0000 |
| commit | 42d9c6f495503d3d9d2db47a9979036c9233f976 (patch) | |
| tree | b4d2be737c3ad6836e62dc35c861e987ea3729e0 /gr-usrp/src | |
| parent | 6bf2c048d94e1c673c06c058b23213cd28292520 (diff) | |
| download | gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.gz gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.bz2 gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.zip | |
Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-usrp/src')
| -rw-r--r-- | gr-usrp/src/Makefile.am | 9 | ||||
| -rw-r--r-- | gr-usrp/src/run_tests.in | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 351ac61d9..26b7043a9 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -63,11 +63,14 @@ ourpython_PYTHON = \ INCLUDES = $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ - $(USRP_INCLUDES) + $(USRP_INCLUDES) \ + $(WITH_INCLUDES) SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) \ $(STD_DEFINES_AND_INCLUDES) \ - $(USRP_INCLUDES) + $(USRP_INCLUDES) \ + $(WITH_INCLUDES) \ + $(WITH_SWIG_INCLUDES) grinclude_HEADERS = \ usrp1_sink_base.h \ diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in index 84ae973f4..f9bdc78b6 100644 --- a/gr-usrp/src/run_tests.in +++ b/gr-usrp/src/run_tests.in @@ -5,11 +5,11 @@ # 3rd parameter is path to Python QA directory # For OS/X -DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/legacy/:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH +DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH # For Win32 -PATH=@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH +PATH=@abs_top_builddir@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH @top_builddir@/run_tests.sh \ @abs_top_srcdir@/gr-usrp \ |