top_srcdir -> top_builddir

ndb/config/type_ndbapitest.mk.am

 
-LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
-         $(top_srcdir)/ndb/src/libndbclient.la
+LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
+         $(top_builddir)/ndb/src/libndbclient.la
 
 INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
 	-I$(top_srcdir)/ndb/include \

ndb/config/type_ndbapitools.mk.am

 
-LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
-         $(top_srcdir)/ndb/src/libndbclient.la
+LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
+         $(top_builddir)/ndb/src/libndbclient.la
 
 INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
 	-I$(top_srcdir)/ndb/include \

ndb/src/Makefile.am

@@ -7,12 +7,12 @@ ndblib_LTLIBRARIES = libndbclient.la
 libndbclient_la_SOURCES =
 
 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 
+              ndbapi/libndbapi.la \
+              common/transporter/libtransporter.la   \
+              common/debugger/libtrace.la     \
+              common/debugger/signaldata/libsignaldataprint.la \
+              common/mgmcommon/libmgmsrvcommon.la \
+              mgmapi/libmgmapi.la \
+              common/logger/liblogger.la       \
+              common/portlib/unix/libportlib.la      \
+              common/util/libgeneral.la 

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

ndb/src/kernel/Makefile.am

@@ -45,14 +45,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_builddir)/ndb/src/common/transporter/libtransporter.la   \
+              $(top_builddir)/ndb/src/common/debugger/libtrace.la     \
+              $(top_builddir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
+              $(top_builddir)/ndb/src/common/logger/liblogger.la       \
+              $(top_builddir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+              $(top_builddir)/ndb/src/mgmapi/libmgmapi.la \
+              $(top_builddir)/ndb/src/common/portlib/unix/libportlib.la      \
+              $(top_builddir)/ndb/src/common/util/libgeneral.la 
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

ndb/src/kernel/blocks/backup/restore/Makefile.am

@@ -3,7 +3,7 @@ ndbtools_PROGRAMS = ndb_restore
 
 ndb_restore_SOURCES = main.cpp Restore.cpp
 
-LDADD_LOC = $(top_srcdir)/ndb/src/libndbclient.la
+LDADD_LOC = $(top_builddir)/ndb/src/libndbclient.la
 
 include $(top_srcdir)/ndb/config/common.mk.am
 

ndb/src/mgmclient/Makefile.am

@@ -11,8 +11,8 @@ 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 \
-            $(top_srcdir)/ndb/src/common/editline/libeditline.a \
+LDADD_LOC = $(top_builddir)/ndb/src/libndbclient.la \
+            $(top_builddir)/ndb/src/common/editline/libeditline.a \
             @TERMCAP_LIB@
 
 AM_LDFLAGS = @ndb_bin_am_ldflags@

ndb/src/mgmsrv/Makefile.am

@@ -17,8 +17,8 @@ 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 \
-	    $(top_srcdir)/ndb/src/common/editline/libeditline.a \
+LDADD_LOC = $(top_builddir)/ndb/src/libndbclient.la \
+	    $(top_builddir)/ndb/src/common/editline/libeditline.a \
 	    @TERMCAP_LIB@
 
 include $(top_srcdir)/ndb/config/common.mk.am

ndb/test/run-test/Makefile.am

@@ -8,7 +8,7 @@ ndbtest_SCRIPTS = atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
 EXTRA_DIST = $(ndbtest_SCRIPTS)
 
 INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmclient
-LDADD_LOC = $(top_srcdir)/ndb/src/mgmclient/CpcClient.o $(top_srcdir)/ndb/src/libndbclient.la
+LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o $(top_builddir)/ndb/src/libndbclient.la
 
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_util.mk.am

ndb/test/tools/Makefile.am

@@ -25,7 +25,7 @@ INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmclient
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
 
-ndb_cpcc_LDADD = $(LDADD) $(top_srcdir)/ndb/src/mgmclient/CpcClient.o
+ndb_cpcc_LDADD = $(LDADD) $(top_builddir)/ndb/src/mgmclient/CpcClient.o
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%