Use ndbclient more

configure.in

@@ -2879,6 +2879,7 @@ AC_SUBST(mgmapiincludedir)
 	-I\$(top_srcdir)/ndb/include/kernel \
 	-I\$(top_srcdir)/ndb/include/transporter \
 	-I\$(top_srcdir)/ndb/include/debugger \
+        -I\$(top_srcdir)/ndb/include/mgmapi \
 	-I\$(top_srcdir)/ndb/include/mgmcommon \
         -I\$(top_srcdir)/ndb/include/ndbapi \
         -I\$(top_srcdir)/ndb/include/util \
@@ -2890,6 +2891,7 @@ AC_SUBST(mgmapiincludedir)
 	-I\$(top_srcdir)/ndb/include/transporter \
 	-I\$(top_srcdir)/ndb/include/debugger \
 	-I\$(top_srcdir)/ndb/include/mgmcommon \
+        -I\$(top_srcdir)/ndb/include/mgmapi \
         -I\$(top_srcdir)/ndb/include/ndbapi \
         -I\$(top_srcdir)/ndb/include/util \
 	-I\$(top_srcdir)/ndb/include/portlib \

ndb/config/type_ndbapi.mk.am

 
 INCLUDES += @NDB_NDBAPI_INCLUDES@
-LDADD += $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la

ndb/config/type_util.mk.am

 
-LDADD += \
-              $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
-              $(top_srcdir)/ndb/src/common/util/libgeneral.la \
-              $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la
-
 INCLUDES += @NDB_UTIL_INCLUDES@

ndb/src/cw/cpcd/Makefile.am

@@ -3,7 +3,7 @@ ndbtools_PROGRAMS = ndb_cpcd
 
 ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
 
-LDADD_LOC = $(top_srcdir)/ndb/src/common/logger/liblogger.la
+LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_util.mk.am

ndb/src/kernel/ndb-main/Makefile.am

@@ -24,7 +24,6 @@ INCLUDES += \
               -I../blocks/dbtux
 
 LDADD +=  \
-              $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
               ../blocks/cmvmi/libcmvmi.a \
               ../blocks/dbacc/libdbacc.a \
               ../blocks/dbdict/libdbdict.a \
@@ -46,9 +45,10 @@ LDADD +=  \
               $(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/logger/liblogger.la       \
               $(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+              $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
               $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la      \
-              $(top_srcdir)/ndb/src/common/logger/liblogger.la       \
               $(top_srcdir)/ndb/src/common/util/libgeneral.la 
 
 # Don't update the files from bitkeeper

ndb/src/mgmclient/Makefile.am

@@ -8,16 +8,12 @@ mgmtclient_SOURCES = \
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
+
 INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
 
-LDADD += \
-	$(top_srcdir)/ndb/src/common/debugger/libtrace.la \
-	$(top_srcdir)/ndb/src/common/logger/liblogger.la \
-	$(top_srcdir)/ndb/src/common/util/libgeneral.la \
-	$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
-	$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
-	$(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \
-	$(top_srcdir)/ndb/src/common/editline/libeditline.a
+LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \
+            $(top_srcdir)/ndb/src/common/editline/libeditline.a \
+            @TERMCAP_LIB@
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

ndb/src/mgmsrv/Makefile.am

@@ -13,12 +13,11 @@ mgmtsrvr_SOURCES = \
 	MgmtSrvrConfig.cpp \
 	CommandInterpreter.cpp
 
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
+INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/src/common/mgmcommon
 
-LDADD_LOC = \
-	$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
-	$(top_srcdir)/ndb/src/common/editline/libeditline.a \
-	@TERMCAP_LIB@
+LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \
+	    $(top_srcdir)/ndb/src/common/editline/libeditline.a \
+	    @TERMCAP_LIB@
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_ndbapi.mk.am

ndb/test/run-test/Makefile.am

@@ -6,11 +6,12 @@ atrt_SOURCES = main.cpp
 ndbtest_SCRIPTS = atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
           atrt-clear-result.sh make-config.sh
 
-INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmclient
-LDADD_LOC = $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la $(top_srcdir)/ndb/src/mgmclient/CpcClient.o
+INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmclient
+LDADD_LOC = $(top_srcdir)/ndb/src/mgmclient/CpcClient.o $(top_srcdir)/ndb/src/libndbclient.la
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_util.mk.am
+include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%