summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTom Rondeau2011-09-01 12:11:07 -0400
committerTom Rondeau2011-09-01 13:49:58 -0400
commit0e962fd8e859f313c9483d6c3444200977a70022 (patch)
tree1da196f2407d774b9eaab5a3302898983c011238 /config
parente17dbbcda50bdb851227c67e68c9d3e2e7732468 (diff)
downloadgnuradio-0e962fd8e859f313c9483d6c3444200977a70022.tar.gz
gnuradio-0e962fd8e859f313c9483d6c3444200977a70022.tar.bz2
gnuradio-0e962fd8e859f313c9483d6c3444200977a70022.zip
digital: adding CPM C++ hier block, which adds a hier directory to gr-digital. Reworked build system to include this in the libraries and modules built.
Diffstat (limited to 'config')
-rw-r--r--config/grc_gr_digital.m416
1 files changed, 16 insertions, 0 deletions
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4
index bde4a3087..d7c1d605f 100644
--- a/config/grc_gr_digital.m4
+++ b/config/grc_gr_digital.m4
@@ -23,6 +23,22 @@ AC_DEFUN([GRC_GR_DIGITAL],[
dnl Don't do gr-digital if gnuradio-core skipped
GRC_CHECK_DEPENDENCY(gr-digital, gnuradio-core)
+ if test $passed != with; then
+ dnl how and where to find INCLUDES and LA and such
+ gr_digital_INCLUDES="\
+-I\${abs_top_srcdir}/gr-digital/lib \
+-I\${abs_top_srcdir}/gr-digital/hier \
+-I\${abs_top_srcdir}/gr-digital/swig"
+ gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-core.la"
+ gr_digital_LIBDIRPATH="\${abs_top_builddir}/gr-digital/lib:\${abs_top_builddir}/gr-digital/lib/.libs"
+ gr_digital_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-digital/swig/.libs:\${abs_top_srcdir}/gr-digital/swig"
+ gr_digital_PYDIRPATH="\${abs_top_srcdir}/gr-digital/python"
+ fi
+
+ AC_SUBST(gr_digital_I)
+ AC_SUBST(gr_digital_SWIGDIRPATH)
+ AC_SUBST(gr_digital_PYDIRPATH)
+
AC_CONFIG_FILES([\
gr-digital/Makefile \
gr-digital/gnuradio-digital.pc \