summaryrefslogtreecommitdiff
path: root/gr-error-correcting-codes/src/lib/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'gr-error-correcting-codes/src/lib/Makefile.am')
-rw-r--r--gr-error-correcting-codes/src/lib/Makefile.am36
1 files changed, 17 insertions, 19 deletions
diff --git a/gr-error-correcting-codes/src/lib/Makefile.am b/gr-error-correcting-codes/src/lib/Makefile.am
index 3168a58f42..602c560a0c 100644
--- a/gr-error-correcting-codes/src/lib/Makefile.am
+++ b/gr-error-correcting-codes/src/lib/Makefile.am
@@ -23,8 +23,6 @@ include $(top_srcdir)/Makefile.common
SUBDIRS = libecc
-LIBS += $(GNURADIO_CORE_LIBS)
-
# Install this stuff so that it ends up as the gnuradio.und module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -32,10 +30,9 @@ LIBS += $(GNURADIO_CORE_LIBS)
ourpythondir = $(grpythondir)
ourlibdir = $(grpythondir)
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(GNURADIO_INCLUDES)
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
-SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) \
- $(GNURADIO_INCLUDES)
+SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES)
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -45,10 +42,10 @@ NON_LOCAL_IFILES = \
$(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
LOCAL_IFILES = \
- gr_syms_to_metrics.i \
- gr_metrics_decode_viterbi_full_block.i \
- gr_streams_encode_convolutional.i \
- gr_streams_encode_turbo.i \
+ ecc_syms_to_metrics.i \
+ ecc_metrics_decode_viterbi_full_block.i \
+ ecc_streams_encode_convolutional.i \
+ ecc_streams_encode_turbo.i \
ecc.i
# These files are built by SWIG. The first is the C++ glue.
@@ -60,18 +57,18 @@ BUILT_SOURCES = \
ecc.py
# This gets ecc.py installed in the right place
-ourpython_PYTHON = \
- __init__.py \
+ourpython_PYTHON = \
+ __init__.py \
ecc.py
ourlib_LTLIBRARIES = _ecc.la
# These are the source files that go into the shared library
_ecc_la_SOURCES = \
- gr_syms_to_metrics.cc \
- gr_metrics_decode_viterbi_full_block.cc \
- gr_streams_encode_convolutional.cc \
- gr_streams_encode_turbo.cc \
+ ecc_syms_to_metrics.cc \
+ ecc_metrics_decode_viterbi_full_block.cc \
+ ecc_streams_encode_convolutional.cc \
+ ecc_streams_encode_turbo.cc \
ecc.cc
# magic flags
@@ -81,14 +78,15 @@ _ecc_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
_ecc_la_LIBADD = \
libecc/libecc.la \
$(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LIBS) \
-lstdc++
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
- gr_syms_to_metrics.h \
- gr_metrics_decode_viterbi_full_block.h \
- gr_streams_encode_convolutional.h \
- gr_streams_encode_turbo.h
+ ecc_syms_to_metrics.h \
+ ecc_metrics_decode_viterbi_full_block.h \
+ ecc_streams_encode_convolutional.h \
+ ecc_streams_encode_turbo.h
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = $(LOCAL_IFILES)