diff options
author | Tom Rondeau <trondeau@vt.edu> | 2012-04-07 20:04:33 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2012-04-07 20:04:33 -0400 |
commit | 7097d4b8428088c86ef99bc90b8da67674f4ab8c (patch) | |
tree | 6beb562a5ac14e97a6d349b574df6f2ba92d63f7 /gr-howto-write-a-block | |
parent | 2ebcbd46267ecc1fb63df0b9598fbcf562a9f1dd (diff) | |
parent | aaa98c095a85724a8782a28717162c1d30d865c2 (diff) |
Merge branch 'maint'
Diffstat (limited to 'gr-howto-write-a-block')
-rw-r--r-- | gr-howto-write-a-block/Makefile.common | 3 | ||||
-rw-r--r-- | gr-howto-write-a-block/config/gr_standalone.m4 | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gr-howto-write-a-block/Makefile.common b/gr-howto-write-a-block/Makefile.common index fca6133c14..2b9cc75afc 100644 --- a/gr-howto-write-a-block/Makefile.common +++ b/gr-howto-write-a-block/Makefile.common @@ -56,7 +56,8 @@ STD_DEFINES_AND_INCLUDES = \ $(DEFINES) \ -I$(abs_top_srcdir)/lib \ -I$(GNURADIO_CORE_INCLUDEDIR) \ - -I$(GNURADIO_CORE_INCLUDEDIR)/swig + -I$(GNURADIO_CORE_INCLUDEDIR)/swig \ + -I$(GRUEL_INCLUDEDIR)/gruel/swig # includes modincludedir = $(includedir)/$(modname) diff --git a/gr-howto-write-a-block/config/gr_standalone.m4 b/gr-howto-write-a-block/config/gr_standalone.m4 index beb98204c6..5ba48892f5 100644 --- a/gr-howto-write-a-block/config/gr_standalone.m4 +++ b/gr-howto-write-a-block/config/gr_standalone.m4 @@ -109,6 +109,7 @@ m4_define([GR_STANDALONE], AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3) + PKG_CHECK_MODULES(GRUEL, gruel >= 3) LIBS="$LIBS $GNURADIO_CORE_LIBS" gnuradio_core_GUILE_LOAD_PATH="`pkg-config --variable=guile_load_path gnuradio-core`" |