From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Thu, 25 Dec 2008 20:03:00 +0000 (+0000)
Subject: Fix include paths for VPATH build (Michael Dickens).  Note, this was one of thoses... 
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;ds=sidebyside;h=d755f1395daf64f3a75d5947cd71b0a61b099392;p=debian%2Fgnuradio

Fix include paths for VPATH build (Michael Dickens).  Note, this was one of thoses cases where 'make distcheck' would pass, yet a VPATH would fail.

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

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 6783e99a..3708dcad 100644
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -58,7 +58,8 @@ AC_DEFUN([GRC_USRP],[
     if test $passed != with; then
 	dnl how and where to find INCLUDES and LA
 	usrp_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/legacy \
-		-I\${abs_top_srcdir}/usrp/firmware/include"
+		-I\${abs_top_srcdir}/usrp/firmware/include \
+		-I\${abs_top_builddir}/usrp/host/lib/legacy"
         usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la"
 	usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband"
 	usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp-inband.la"
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am
index e1ac1b85..dfbfe1bf 100644
--- a/gr-usrp/apps/Makefile.am
+++ b/gr-usrp/apps/Makefile.am
@@ -25,6 +25,7 @@ include $(top_srcdir)/Makefile.common
 AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \
 	 -I$(top_srcdir)/gr-usrp/src \
 	 -I$(top_srcdir)/usrp/host/lib/legacy \
+	 -I\${abs_top_builddir}/usrp/host/lib/legacy \
 	 -I$(top_srcdir)/usrp/firmware/include \
 	 $(WITH_INCLUDES)