Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

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/libndbclient.la
+LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_util.mk.am

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

 
+ndbbindir_root = $(prefix)
+ndbbindir = $(ndbbindir_root)/ndb/bin
 ndbbin_PROGRAMS = ndb
 
 ndb_SOURCES = Main.cpp SimBlockList.cpp
@@ -42,14 +44,14 @@ LDADD +=  \
               ../blocks/dbtux/libdbtux.a \
               ../vm/libkernel.a	\
               ../error/liberror.a \
-              $(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/util/libgeneral.la 
+              $(top_srcdir)/ndb/src/common/transporter/.libs/libtransporter.a   \
+              $(top_srcdir)/ndb/src/common/debugger/.libs/libtrace.a     \
+              $(top_srcdir)/ndb/src/common/debugger/signaldata/.libs/libsignaldataprint.a \
+              $(top_srcdir)/ndb/src/common/logger/.libs/liblogger.a       \
+              $(top_srcdir)/ndb/src/common/mgmcommon/.libs/libmgmsrvcommon.a \
+              $(top_srcdir)/ndb/src/mgmapi/.libs/libmgmapi.a \
+              $(top_srcdir)/ndb/src/common/portlib/unix/.libs/libportlib.a      \
+              $(top_srcdir)/ndb/src/common/util/.libs/libgeneral.a 
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

ndb/src/mgmclient/Makefile.am

@@ -11,7 +11,7 @@ include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
 
 INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
 
-LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \
+LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a \
             $(top_srcdir)/ndb/src/common/editline/libeditline.a \
             @TERMCAP_LIB@
 

ndb/src/mgmsrv/Makefile.am

@@ -17,7 +17,7 @@ INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \
                -I$(top_srcdir)/ndb/src/mgmapi \
                -I$(top_srcdir)/ndb/src/common/mgmcommon
 
-LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la \
+LDADD_LOC = $(top_srcdir)/ndb/src/.libs/libndbclient.a \
 	    $(top_srcdir)/ndb/src/common/editline/libeditline.a \
 	    @TERMCAP_LIB@