From db1b2f7c85600ffd108bd69a381505e0e7223a8a Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Sun, 6 Aug 2006 02:12:07 +0000
Subject: [PATCH] better (read: real) fix for ticket:15

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3179 221aa14e-8319-0410-a670-987f0aec2ac5
---
 Makefile.common            |  2 +-
 config/grc_usrp.m4         | 11 ++++++++---
 gr-usrp/src/Makefile.am    |  5 +----
 gr-usrp/src/run_tests.in   |  9 +++++----
 usrp/host/swig/Makefile.am |  5 +----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 1e4395a7..08951943 100644
--- 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 85e7f31f..5ef847a4 100644
--- 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 ecec8b9f..611dd604 100644
--- 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 793cb249..39a158ba 100644
--- 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 d692a091..5b15a363 100644
--- 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)
-- 
2.30.2