List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:October 27 2007 12:00am
Subject:Rev 207: Hooked the testndbapi dir into automake so that it can build with the configured settings. in http://bazaar.launchpad.net/~ndb-connectors/ndb...
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 207
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Fri 2007-10-26 16:59:50 -0700
message:
  Hooked the testndbapi dir into automake so that it can build with the configured
settings.
removed:
  testndbapi/Makefile           
svn-v2:1@5fca6d9a-db22-0410-b55c-899b0a28da89-trunk-testndbapi%2fMakefile
added:
  testndbapi/Makefile.am         makefile.am-20071026235931-jssnmc2smymhxj0f-1
modified:
  .bzrignore                     bzrignore-20070227185147-qqkzlz6d3jh97cex-1
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
=== removed file 'testndbapi/Makefile'
--- a/testndbapi/Makefile	2007-09-20 13:12:36 +0000
+++ b/testndbapi/Makefile	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-TARGET = teststrins
-SRCS = $(TARGET).cpp
-OBJS = $(TARGET).o
-CXX = g++
-CFLAGS = -c -Wall -fno-rtti -fno-exceptions -I/usr/include/mysql
-I/usr/include/mysql/storage/ndb -I/usr/include/mysql/storage/ndb/ndbapi
-CXXFLAGS = 
-DEBUG = 
-LFLAGS = -Wall -L/usr/lib/mysql
-TOP_SRCDIR = ../../..
-SYS_LIB = 
-
-$(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LFLAGS) $(LIB_DIR) $(OBJS) /usr/lib/libndbclient.a -lmysqlclient_r
-lmysys -lmystrings -lz $(SYS_LIB) -o $(TARGET)
-
-$(TARGET).o: $(SRCS)
-	$(CXX) $(CFLAGS) -I$(INCLUDE_DIR)/include -I$(INCLUDE_DIR)/ndb/include
-I$(INCLUDE_DIR)/ndb/include/ndbapi $(SRCS)
-
-clean:
-	rm -f *.o $(TARGET)

=== added file 'testndbapi/Makefile.am'
--- a/testndbapi/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/testndbapi/Makefile.am	2007-10-26 23:59:50 +0000
@@ -0,0 +1,12 @@
+bin_PROGRAMS =  ndbapi_simple_index \
+                testchars \
+                teststrins \
+                ndbfoo \
+                testdateins
+
+ndbapi_simple_index_SOURCES = ndbapi_simple_index.cpp
+testchars_SOURCES = testchars.cpp
+teststrins_SOURCES = teststrins.cpp
+ndbfoo_SOURCES = ndbfoo
+testdateins_SOURCES = testdateins
+

=== modified file '.bzrignore'
--- a/.bzrignore	2007-08-27 16:38:31 +0000
+++ b/.bzrignore	2007-10-26 23:59:50 +0000
@@ -126,3 +126,5 @@
 ndbapi_wrap.cxx
 com/mysql/cluster/ndbapi/NdbError.java
 javadoc
+config.h
+config.h.in

=== modified file 'configure.in'
--- a/configure.in	2007-10-24 04:03:28 +0000
+++ b/configure.in	2007-10-26 23:59:50 +0000
@@ -139,4 +139,5 @@
 ruby/Makefile \
 php/Makefile \
 lua/Makefile \
+testndbapi/Makefile \
 java/ndbj.props)

Thread
Rev 207: Hooked the testndbapi dir into automake so that it can build with the configured settings. in http://bazaar.launchpad.net/~ndb-connectors/ndb...Monty Taylor27 Oct