summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.(none)>2004-05-26 17:51:58 +0000
committerunknown <tomas@poseidon.(none)>2004-05-26 17:51:58 +0000
commit709b1b897818325b76b3f2fa856adf2adbbfdde9 (patch)
treef0fd876419ddad28825f33b7df79b8ea89dc21cb
parent7c40ea2db39047beb42163284de32a0a18c5c3c4 (diff)
downloadmariadb-git-709b1b897818325b76b3f2fa856adf2adbbfdde9.tar.gz
makefix
-rw-r--r--ndb/test/ndbapi/Makefile.am4
-rw-r--r--ndb/test/tools/Makefile.am9
2 files changed, 8 insertions, 5 deletions
diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am
index 48870516c22..92c4a4a20bd 100644
--- a/ndb/test/ndbapi/Makefile.am
+++ b/ndb/test/ndbapi/Makefile.am
@@ -11,7 +11,6 @@ flexBench \
flexHammer \
flexScan \
flexTT \
-flexTimedAsynch \
testBackup \
testBasic \
testBasicAsynch \
@@ -31,6 +30,7 @@ testTimeout \
testTransactions \
test_event
+#flexTimedAsynch
#testBlobs
#flex_bench_mysql
@@ -42,7 +42,7 @@ flexBench_SOURCES = flexBench.cpp
flexHammer_SOURCES = flexHammer.cpp
flexScan_SOURCES = flexScan.cpp
flexTT_SOURCES = flexTT.cpp
-flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
+#flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp
testBackup_SOURCES = testBackup.cpp
testBasic_SOURCES = testBasic.cpp
diff --git a/ndb/test/tools/Makefile.am b/ndb/test/tools/Makefile.am
index 554a37821fd..715727f9262 100644
--- a/ndb/test/tools/Makefile.am
+++ b/ndb/test/tools/Makefile.am
@@ -1,7 +1,6 @@
-bin_PROGRAMS = waiter hugoCalculator hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index
+bin_PROGRAMS = waiter hugoCalculator hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index ndb_cpcc
-# ndb_cpcc
# transproxy
hugoCalculator_SOURCES = hugoCalculator.cpp
@@ -20,10 +19,14 @@ waiter_SOURCES = waiter.cpp
verify_index_SOURCES = verify_index.cpp
copy_tab_SOURCES = copy_tab.cpp
create_index_SOURCES = create_index.cpp
-#ndb_cpcc_SOURCES = cpcc.cpp
+ndb_cpcc_SOURCES = cpcc.cpp
+
+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
+
# Don't update the files from bitkeeper
%::SCCS/s.%