diff options
| -rw-r--r-- | ndb/src/cw/cpcd/Makefile.am | 2 | ||||
| -rw-r--r-- | ndb/src/kernel/ndb-main/Makefile.am | 18 | ||||
| -rw-r--r-- | ndb/src/mgmclient/Makefile.am | 2 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/Makefile.am | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/ndb/src/cw/cpcd/Makefile.am b/ndb/src/cw/cpcd/Makefile.am index 53eeaa48dc3..8d5a8d63e73 100644 --- a/ndb/src/cw/cpcd/Makefile.am +++ b/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 diff --git a/ndb/src/kernel/ndb-main/Makefile.am b/ndb/src/kernel/ndb-main/Makefile.am index 77565800f71..b41c6e948ea 100644 --- a/ndb/src/kernel/ndb-main/Makefile.am +++ b/ndb/src/kernel/ndb-main/Makefile.am @@ -1,4 +1,6 @@ +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.% diff --git a/ndb/src/mgmclient/Makefile.am b/ndb/src/mgmclient/Makefile.am index a560d8e6d6f..56c7c050558 100644 --- a/ndb/src/mgmclient/Makefile.am +++ b/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@ diff --git a/ndb/src/mgmsrv/Makefile.am b/ndb/src/mgmsrv/Makefile.am index 439d126dc5b..56e8b2ee628 100644 --- a/ndb/src/mgmsrv/Makefile.am +++ b/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@ |