summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2011-07-10 20:30:25 -0400
committerTom Rondeau <trondeau@vt.edu>2011-07-10 20:32:28 -0400
commit7efeff11a41392c55d2e2a620c17b9e1bda21205 (patch)
treec12587930fa24eb1a2598f5082129b75699f61a2
parentf232855f93d4bccf08b9836943b55c25c2ef0055 (diff)
digital: work on build to make gr-trellis dependent on gr-digital.
-rw-r--r--config/grc_gr_digital.m41
-rw-r--r--config/grc_gr_trellis.m41
-rw-r--r--configure.ac2
-rw-r--r--gr-trellis/src/lib/Makefile.am8
-rw-r--r--gr-trellis/src/lib/trellis.i6
5 files changed, 10 insertions, 8 deletions
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4
index cb9913bb33..a0765a3419 100644
--- a/config/grc_gr_digital.m4
+++ b/config/grc_gr_digital.m4
@@ -31,6 +31,7 @@ AC_DEFUN([GRC_GR_DIGITAL],[
gr-digital/lib/Makefile \
gr-digital/python/Makefile \
gr-digital/python/run_tests \
+ gr-digital/python/utils/Makefile \
gr-digital/swig/Makefile \
gr-digital/swig/run_guile_tests \
])
diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4
index bc9ca6f495..963d5af792 100644
--- a/config/grc_gr_trellis.m4
+++ b/config/grc_gr_trellis.m4
@@ -22,6 +22,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[
dnl Don't do gr-trellis if gnuradio-core skipped
GRC_CHECK_DEPENDENCY(gr-trellis, gnuradio-core)
+ GRC_CHECK_DEPENDENCY(gr-trellis, gr-digital)
AC_CONFIG_FILES([\
gr-trellis/Makefile \
diff --git a/configure.ac b/configure.ac
index 771afd8ada..f31cc963f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,7 @@ GRC_GRUEL dnl must come first
GRC_VOLK
GRC_GCELL
GRC_GNURADIO_CORE
+GRC_GR_DIGITAL
GRC_USRP
GRC_USRP2
GRC_GR_USRP dnl this must come after GRC_USRP
@@ -370,7 +371,6 @@ GRC_GR_PAGER
GRC_GR_RADAR_MONO
GRC_GR_RADIO_ASTRONOMY
GRC_GR_TRELLIS
-GRC_GR_DIGITAL
GRC_GR_VIDEO_SDL
GRC_GR_WXGUI
GRC_GR_QTGUI
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index e81490089e..795ac28b4c 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -30,8 +30,8 @@ EXTRA_DIST += \
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \
- -I$(abs_top_builddir)/gr-digital/lib
-
+ -I$(abs_top_srcdir)/gr-digital/lib -I/home
+
# ----------------------------------------------------------------
# these scripts generate trellis codes from template files
@@ -162,8 +162,8 @@ BUILT_SOURCES += $(python_built_sources)
# Location of non-standard SWIG interface files
trellis_swig_args = \
- -I$(abs_top_builddir)/gr-digital/lib \
- -I$(abs_top_builddir)/gr-digital/swig
+ -I$(top_srcdir)/gr-digital/lib \
+ -I$(top_srcdir)/gr-digital/swig
if GUILE
TESTS += run_guile_tests
diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index a030ab906e..d01ab529a8 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -50,9 +50,9 @@
%import "digital_metric_type.h"
%import "digital_constellation.i"
-%pythoncode %{
- from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
- %}
+ //%pythoncode %{
+ // from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
+ // %}
#if SWIGGUILE
%scheme %{