4 files changed, 16 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 60b53ec39d5..27e1ae91189 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1355,7 +1355,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
       AC_DEFINE(HAVE_NDBCLUSTER_DB)
       have_ndbcluster="yes"
       ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
-      ndbcluster_libs="\$(top_builddir)/ndb/src/ndbapi/libNDB_API.la"
+      ndbcluster_libs="\$(top_builddir)/ndb/src/libndbclient.la"
       ndbcluster_system_libs=""
       ;;
     * )
diff --git a/ndb/src/Makefile.am b/ndb/src/Makefile.am
index 745a33ccf45..c81950fcea3 100644
--- a/ndb/src/Makefile.am
+++ b/ndb/src/Makefile.am
@@ -1 +1,14 @@
 SUBDIRS = common mgmapi ndbapi kernel mgmsrv mgmclient cw
+
+ndblib_LTLIBRARIES = libndbclient.la
+
+libndbclient_la_LIBADD =  \
+              $(top_srcdir)/ndb/src/ndbapi/libndbapi.la \
+              $(top_srcdir)/ndb/src/common/transporter/libtransporter.la   \
+              $(top_srcdir)/ndb/src/common/debugger/libtrace.la     \
+              $(top_srcdir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
+              $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+              $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
+              $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
+              $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la      \
+              $(top_srcdir)/ndb/src/common/util/libgeneral.la 
diff --git a/ndb/src/mgmapi/Makefile.am b/ndb/src/mgmapi/Makefile.am
index 758a874fca4..72b21ecfae0 100644
--- a/ndb/src/mgmapi/Makefile.am
+++ b/ndb/src/mgmapi/Makefile.am
@@ -1,5 +1,5 @@
 
-ndblib_LTLIBRARIES = libmgmapi.la libMGM_API.la
+noinst_LTLIBRARIES = libmgmapi.la libMGM_API.la
 
 libmgmapi_la_SOURCES_loc = mgmapi.cpp
 
diff --git a/ndb/src/ndbapi/Makefile.am b/ndb/src/ndbapi/Makefile.am
index 1c474d26cb0..3f585be74c6 100644
--- a/ndb/src/ndbapi/Makefile.am
+++ b/ndb/src/ndbapi/Makefile.am
@@ -1,6 +1,6 @@
 #SUBDIRS = signal-sender
 
-ndblib_LTLIBRARIES = libndbapi.la libNDB_API.la
+noinst_LTLIBRARIES = libndbapi.la libNDB_API.la
 
 libndbapi_la_SOURCES_loc = \
         TransporterFacade.cpp   \