summaryrefslogtreecommitdiff
path: root/gr-trellis/src/lib
diff options
context:
space:
mode:
authorjcorgan2007-02-26 21:26:10 +0000
committerjcorgan2007-02-26 21:26:10 +0000
commit63d05d64826fd1b3eef89e5a8a14a73b318464ac (patch)
tree3d720a44e1088f92769f6a56408202446fbd569f /gr-trellis/src/lib
parent789bfcc9d9172645e7b4bf0c7fbf30574e03c201 (diff)
downloadgnuradio-63d05d64826fd1b3eef89e5a8a14a73b318464ac.tar.gz
gnuradio-63d05d64826fd1b3eef89e5a8a14a73b318464ac.tar.bz2
gnuradio-63d05d64826fd1b3eef89e5a8a14a73b318464ac.zip
Merged r4632:4645 on jcorgan/linking into trunk. Cleans up linking issues with libtool and already installed libraries.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4646 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-trellis/src/lib')
-rw-r--r--gr-trellis/src/lib/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index ef27bf580..bfb573cf3 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -110,7 +110,7 @@ _trellis_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
# c++ standard library
_trellis_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS)