better (read: real) fix for ticket:15

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3179 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/Makefile.common b/Makefile.common
index 1e4395a7eae4b56945eb429a5b5983edf4de93ec..089519438fb0feb5bffe3dcb8034f37ef74eb351 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -37,4 +37,4 @@ grpyexecdir = $(pyexecdir)/gnuradio
 SWIGPYTHONFLAGS = -fvirtual -python -modern
 
 # gnuradio-core library link command
-GNURADIO_CORE_LIBS = -L$(top_srcdir)/gnuradio-core/src/lib -lgnuradio-core -lfftw3f -lm
+GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib -lgnuradio-core -lfftw3f -lm

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 85e7f31feff97478961030367ae26e90998f8c46..5ef847a445375308aeb3a08dc183cbc3b279ddb9 100644 (file)
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -68,14 +68,19 @@ AC_DEFUN([GRC_USRP],[
 
     if test $succeeded = yes; then
        dnl Define where to look for USRP includes
-       USRP_INCLUDES='-I$(top_srcdir)/host/lib -I$(top_srcdir)/firmware/include'
+       USRP_INCLUDES='-I$(top_srcdir)/usrp/host/lib -I$(top_srcdir)/usrp/firmware/include'
        AC_SUBST(USRP_INCLUDES)
 
         USRP_DEFINES=''
         AC_SUBST(USRP_DEFINES)
 
-        DEFINES="$USRP_DEFINES"
-        AC_SUBST(DEFINES)
+       dnl Define where to find USRP library
+       USRP_LIBS='-L$(top_builddir)/usrp/host/lib -lusrp'
+       AC_SUBST(USRP_LIBS)
+
+       dnl FIXME this looked very suspicious
+        dnl DEFINES="$USRP_DEFINES"
+        dnl AC_SUBST(DEFINES)
 
        subdirs="$subdirs usrp"
     else

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index ecec8b9f040298bdb58b0855687dfcec87a1270a..611dd604d9568f060e090eaa236c2039ef0a7b78 100644 (file)
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -60,10 +60,7 @@ ourpython_PYTHON =                   \
         usrp_multi.py                  
 
 
-USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib -I$(top_srcdir)/usrp/firmware/include
-USRP_LIBS = -L$(top_srcdir)/usrp/host/lib -lusrp
-
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) 
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(USRP_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) $(USRP_INCLUDES)
 

diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
index 793cb2491e536ae852b609c62803a968eecccdc2..39a158ba0b18a232668661804a4967a0c1c410e4 100644 (file)
--- a/gr-usrp/src/run_tests.in
+++ b/gr-usrp/src/run_tests.in
@@ -18,11 +18,12 @@ libsrc=@abs_top_srcdir@/gr-usrp/src
 py=@abs_top_srcdir@/gr-usrp/src
 
 # Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck.  We really need to ask gnuradio-core
-# where it put its python files.
-grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
+grbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
+# Where to look for USRP lib in current build tree
+usrpbld=@abs_top_builddir@/usrp/host/lib/.libs
+
+PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$usrpbld:$PYTHONPATH"
 export PYTHONPATH
 
 #

diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index d692a0913a48ff78c9db532801f84f787a5ad97c..5b15a363424312e5afe664d99937d8dcbf615eb4 100644 (file)
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -51,10 +51,7 @@ ourpython_PYTHON =                   \
        usrp_prims.py                   
 
 
-INCLUDES =                                     \
-       -I$(top_srcdir)/usrp/host/lib           \
-       -I$(top_srcdir)/usrp/firmware/include   \
-       $(PYTHON_CPPFLAGS) -I$(srcdir)
+INCLUDES = $(USRP_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir)
 
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)