summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-11-30 12:08:16 -0500
committerJosh Blum <josh@joshknows.com>2010-11-30 12:08:16 -0500
commit775bd35cde0b42f3aaab76f4014e5915783ecb44 (patch)
tree406ced75047696bea792f01c8b550d56029142ca
parentceb0c70b353be63b133e6ba830ea1882a2e0ea9d (diff)
uhd: added libdir to UHD CFLAGS (shared by lib and swig)
-rw-r--r--config/grc_gr_uhd.m41
-rw-r--r--gr-uhd/swig/Makefile.am3
2 files changed, 2 insertions, 2 deletions
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
index 98ab5d2e56..4de905ad0d 100644
--- a/config/grc_gr_uhd.m4
+++ b/config/grc_gr_uhd.m4
@@ -29,6 +29,7 @@ AC_DEFUN([GRC_GR_UHD],[
[UHD], [uhd >= 1.0.0 uhd < 2.0.0], [],
[passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 1.x.x])]
)
+ UHD_CFLAGS="${UHD_CFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib"
AC_SUBST(UHD_CFLAGS)
AC_SUBST(UHD_LIBS)
fi
diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am
index 183e6b587e..fd496fc7bf 100644
--- a/gr-uhd/swig/Makefile.am
+++ b/gr-uhd/swig/Makefile.am
@@ -25,8 +25,7 @@ AM_CPPFLAGS = \
$(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
$(WITH_INCLUDES) \
- $(UHD_CFLAGS) \
- -I$(top_srcdir)/gr-uhd/lib
+ $(UHD_CFLAGS)
if PYTHON
# ----------------------------------------------------------------