summaryrefslogtreecommitdiff
path: root/ndb/config
diff options
context:
space:
mode:
authortomas@poseidon.(none) <>2004-05-26 15:36:55 +0000
committertomas@poseidon.(none) <>2004-05-26 15:36:55 +0000
commit8327a68438cb13b85af6ada424c77fccd54e0a3a (patch)
treed3d9058cf001e85ae696c10f65a429f2115fab0b /ndb/config
parentfff33634be2bc45a7ca559beeaa4985e7e4d2eb4 (diff)
downloadmariadb-git-8327a68438cb13b85af6ada424c77fccd54e0a3a.tar.gz
neww ndb automake
Diffstat (limited to 'ndb/config')
-rw-r--r--ndb/config/common.mk.am12
-rw-r--r--ndb/config/type_ndbapitest.mk.am4
2 files changed, 15 insertions, 1 deletions
diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am
index efeb6aef52f..f8d0882ac00 100644
--- a/ndb/config/common.mk.am
+++ b/ndb/config/common.mk.am
@@ -1,7 +1,17 @@
-INCLUDES =
+INCLUDES = $(INCLUDES_LOC)
LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
DEFS = @DEFS@ @NDB_DEFS@
# ndb cannot be compiled with -fno-implicit-templaces
NDB_CXXFLAGS=-fimplicit-templates
##use AM_CXXFLAGS for other flags
+
+#noinst_SCRIPTS = ndb_local_bin
+ndb_local_bin: $(PROGRAMS)
+ set -x; \
+ for f in $(PROGRAMS); do \
+ g=lib/`basename $$f`; \
+ rm -f $$g; \
+ @LN_CP_F@ $$f; \
+ done; \
+ touch $@;
diff --git a/ndb/config/type_ndbapitest.mk.am b/ndb/config/type_ndbapitest.mk.am
index 5f4a7313986..20ba5032d02 100644
--- a/ndb/config/type_ndbapitest.mk.am
+++ b/ndb/config/type_ndbapitest.mk.am
@@ -1,2 +1,6 @@
+LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
+ $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la \
+ $(top_srcdir)/ndb/src/mgmapi/libMGM_API.la
+
INCLUDES += @NDB_NDBAPITEST_INCLUDES@