summaryrefslogtreecommitdiff
path: root/pmt
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2007-02-26 21:26:10 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2007-02-26 21:26:10 +0000
commit63d05d64826fd1b3eef89e5a8a14a73b318464ac (patch)
tree3d720a44e1088f92769f6a56408202446fbd569f /pmt
parent789bfcc9d9172645e7b4bf0c7fbf30574e03c201 (diff)
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 'pmt')
-rw-r--r--pmt/src/lib/Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am
index aa2cc514ba..a738a16928 100644
--- a/pmt/src/lib/Makefile.am
+++ b/pmt/src/lib/Makefile.am
@@ -89,12 +89,8 @@ libpmt_qa_la_SOURCES = \
# magic flags
libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
-# link the library against the c++ standard library
-# Note: Win32 libtool doesn't pull dependencies from the .la file
-# correctly, so we must add $(PMT_LIBS) below
libpmt_qa_la_LIBADD = \
libpmt.la \
- $(PMT_LIBS) \
$(CPPUNIT_LIBS) \
-lstdc++