summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-10-04 15:42:16 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-10-04 15:42:16 +0300
commit8789c7972339340feb6a49903ff247de580bc5dd (patch)
tree0b41fbab5c8e486500b5c53bbe818e62f6f583f2 /sql/Makefile.am
parent5f9c629da0c08cd742a16419f4f66cdb18505302 (diff)
parent40ee088f68a452ac2ed19622481c73d6d38c7ec3 (diff)
downloadmariadb-git-8789c7972339340feb6a49903ff247de580bc5dd.tar.gz
merge
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r--sql/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index b7c4bf44111..16161798078 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -81,7 +81,6 @@ mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
mysqld_LDADD = libndb.la \
@MYSQLD_EXTRA_LDFLAGS@ \
- @pstack_libs@ \
@mysql_plugin_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@