diff options
| author | unknown <tomas@poseidon.(none)> | 2004-05-27 07:04:45 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-05-27 07:04:45 +0000 |
| commit | c41b0e48c9bf6b6ac4a574261b9f09905484b106 (patch) | |
| tree | 90c3cd703ab050cc2aaca70e8722bfc4d782a713 /ndb/config | |
| parent | 34e7ad059a88574c0f69a3f444f0fede168b8a5d (diff) | |
| download | mariadb-git-c41b0e48c9bf6b6ac4a574261b9f09905484b106.tar.gz | |
several ndb automake changes, see respective file
ndb/tools/waiter.cpp:
Rename: ndb/test/tools/waiter.cpp -> ndb/tools/waiter.cpp
configure.in:
added install dirs for ndb
ndb/Makefile.am:
ndb headers for install
ndb/config/common.mk.am:
DEFS_LOC in ndb make
ndb/config/type_ndbapi.mk.am:
added LDADD=libNDB_API.la default for type_ndbapi
ndb/src/cw/cpcd/Makefile.am:
changes install dir
ndb/src/kernel/blocks/backup/restore/Makefile.am:
changes install dir
ndb/src/kernel/ndb-main/Makefile.am:
changes install dir
ndb/src/mgmapi/Makefile.am:
changes install dir
ndb/src/mgmclient/Makefile.am:
changes install dir
ndb/src/mgmsrv/Makefile.am:
changes install dir
ndb/src/ndbapi/Makefile.am:
changes install dir
ndb/test/ndbapi/Makefile.am:
changes install dir
ndb/test/ndbapi/bank/Makefile.am:
changes install dir
ndb/test/tools/Makefile.am:
changes install dir
mysql-test/ndb/install_ndbcluster.sh:
new
mysql-test/ndb/stop_ndbcluster.sh:
new
ndb/tools/Makefile.am:
changes install dir
Diffstat (limited to 'ndb/config')
| -rw-r--r-- | ndb/config/common.mk.am | 2 | ||||
| -rw-r--r-- | ndb/config/type_ndbapi.mk.am | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am index f8d0882ac00..cc320120b2a 100644 --- a/ndb/config/common.mk.am +++ b/ndb/config/common.mk.am @@ -1,7 +1,7 @@ INCLUDES = $(INCLUDES_LOC) LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) -DEFS = @DEFS@ @NDB_DEFS@ +DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) # ndb cannot be compiled with -fno-implicit-templaces NDB_CXXFLAGS=-fimplicit-templates ##use AM_CXXFLAGS for other flags diff --git a/ndb/config/type_ndbapi.mk.am b/ndb/config/type_ndbapi.mk.am index 864690cec7b..a9c98f3f6e6 100644 --- a/ndb/config/type_ndbapi.mk.am +++ b/ndb/config/type_ndbapi.mk.am @@ -1,2 +1,3 @@ INCLUDES += @NDB_NDBAPI_INCLUDES@ +LDADD += $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la |