Rev 238: Moved swig interface files into mgmapi and ndbapi directories so that depends can more easily be calculated. in http://bazaar.launchpad.net/...

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 238
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Tue 2007-11-06 14:59:00 -0800
message:
  Moved swig interface files into mgmapi and ndbapi directories so that depends can more
easily be calculated. 
  Fixed build deps, so that make clean shouldn't be necessary to build anymore. 
added:
  interface/mgmapi/              mgmapi-20071106201543-ge6k1see57hx4tmf-2
  interface/ndbapi/              ndbapi-20071106201543-ge6k1see57hx4tmf-1
renamed:
  interface/ClusterState.i => interface/mgmapi/ClusterState.i
clusterstate.i-20070528224404-qscgbkcvhcru9u2o-1
  interface/Ndb.i => interface/ndbapi/Ndb.i ndb.i-20070228021421-qkr4cbpxymyqdrf3-1
  interface/NdbBlob.i => interface/ndbapi/NdbBlob.i
ndbblob.i-20070320103812-m6vddks4sg20gnqv-1
  interface/NdbClusterConnection.i => interface/ndbapi/NdbClusterConnection.i
ndb_cluster_connecti-20070228021421-qkr4cbpxymyqdrf3-6
  interface/NdbDictionary.i => interface/ndbapi/NdbDictionary.i
ndbdictionary.i-20070323110251-l7mg72hiddtuzeh0-1
  interface/NdbError.i => interface/ndbapi/NdbError.i
ndberror.i-20070228021421-qkr4cbpxymyqdrf3-2
  interface/NdbEventOperation.i => interface/ndbapi/NdbEventOperation.i
ndbeventoperation.i-20070625162920-mfe5hei0d2x85mrk-1
  interface/NdbFactory.i => interface/ndbapi/NdbFactory.i
ndbfactory.i-20070427052328-bwn5ewzrbigsg9v5-1
  interface/NdbIndexOperation.i => interface/ndbapi/NdbIndexOperation.i
ndbindexoperation.i-20070426125056-cdc2fzutv5osp12a-1
  interface/NdbIndexScanOperation.i => interface/ndbapi/NdbIndexScanOperation.i
ndbindexscanoperatio-20070426125039-esztodu0kcqbofgn-1
  interface/NdbLogEvent.i => interface/mgmapi/NdbLogEvent.i
ndblogevent.i-20070906065931-8drgzkovsy4cdn0b-1
  interface/NdbLogEventManager.i => interface/mgmapi/NdbLogEventManager.i
ndbmgmlogeventhandle-20070906065939-pj4qrhof8kkzg3d1-1
  interface/NdbMgm.i => interface/mgmapi/NdbMgm.i
ndbmgm.i-20070528224404-qscgbkcvhcru9u2o-4
  interface/NdbMgmFactory.i => interface/mgmapi/NdbMgmFactory.i
ndbmgmfactory.i-20070528224404-qscgbkcvhcru9u2o-3
  interface/NdbMgmReply.i => interface/mgmapi/NdbMgmReply.i
ndbmgmreply.i-20070528224404-qscgbkcvhcru9u2o-5
  interface/NdbOperation.i => interface/ndbapi/NdbOperation.i
ndboperation.i-20070228021421-qkr4cbpxymyqdrf3-3
  interface/NdbRecAttr.i => interface/ndbapi/NdbRecAttr.i
ndbrecattr.i-20070228021421-qkr4cbpxymyqdrf3-4
  interface/NdbScanFilter.i => interface/ndbapi/NdbScanFilter.i
ndbscanfilter.i-20070521223726-lvjwmtu5b6uvgsft-1
  interface/NdbScanOperation.i => interface/ndbapi/NdbScanOperation.i
ndbscanoperation.i-20070228021421-qkr4cbpxymyqdrf3-5
  interface/NdbTransaction.i => interface/ndbapi/NdbTransaction.i
ndbtransaction.i-20070227184716-ecjyhh3jgvmye4de-7
  interface/NodeState.i => interface/mgmapi/NodeState.i
nodestate.i-20070528224404-qscgbkcvhcru9u2o-6
  interface/mgmglobals.i => interface/mgmapi/mgmglobals.i
mgm.i-20070228021421-qkr4cbpxymyqdrf3-8
  interface/ndbglobals.i => interface/ndbapi/ndbglobals.i
globals.i-20070228021421-qkr4cbpxymyqdrf3-7
modified:
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
  csharp/Makefile.am             makefile.in-20070228073157-gkwqutuh9f3nq7s2-1
  csharp/ndbapi.i               
svn-v2:10@5fca6d9a-db22-0410-b55c-899b0a28da89-trunk-csharp%2fndb.i
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  java/mgmj.i                    mgmapi.i-20070415064013-80k9rsqzumm2kjaf-1
  java/ndbj.i                    ndbj.i-20070913223244-5938mztpztyn9sry-1
  lua/Makefile.am                makefile.am-20070727221140-30x3yi1g0lf9rflk-2
  lua/ndbapi.i                   ndbapi.i-20070727221140-30x3yi1g0lf9rflk-3
  perl/Makefile.am               makefile.am-20070228070325-lv4v4ey3018yr147-1
  perl/mgmapi.i                  mgmapi.i-20070415084702-pjs702i1rleb6otl-1
  perl/mgmapi/Makefile.PL        makefile.pl-20070415084659-wsk1egwac627tea7-2
  perl/ndbapi.i                  ndb.i-20070225155255-5ief7aicto319mbu-1
  perl/ndbapi/Makefile.PL        makefile.pl-20070415084728-1u1ct1xe6fw97w3l-2
  python/Makefile.am             makefile.am-20070925115907-x2wrdte5kicyfrrw-1
  python/mgmapi.i               
svn-v2:10@5fca6d9a-db22-0410-b55c-899b0a28da89-trunk-python%2fmgm.i
  python/ndbapi.i               
svn-v2:1@5fca6d9a-db22-0410-b55c-899b0a28da89-trunk-python%2fndb.i
  ruby/Makefile.am               makefile.am-20070228212451-7arjxk90dkwcn5xr-2
  ruby/mgmapi.i                  mgmapi.i-20070415091411-plc5gtpiwg93c2lx-1
  ruby/ndbapi.i                  ndb.i-20070228212451-7arjxk90dkwcn5xr-3
  interface/ndbapi/NdbTransaction.i ndbtransaction.i-20070227184716-ecjyhh3jgvmye4de-7
=== added directory 'interface/mgmapi'
=== added directory 'interface/ndbapi'
=== renamed file 'interface/ClusterState.i' => 'interface/mgmapi/ClusterState.i'
=== renamed file 'interface/Ndb.i' => 'interface/ndbapi/Ndb.i'
=== renamed file 'interface/NdbBlob.i' => 'interface/ndbapi/NdbBlob.i'
=== renamed file 'interface/NdbClusterConnection.i' =>
'interface/ndbapi/NdbClusterConnection.i'
=== renamed file 'interface/NdbDictionary.i' => 'interface/ndbapi/NdbDictionary.i'
=== renamed file 'interface/NdbError.i' => 'interface/ndbapi/NdbError.i'
=== renamed file 'interface/NdbEventOperation.i' =>
'interface/ndbapi/NdbEventOperation.i'
=== renamed file 'interface/NdbFactory.i' => 'interface/ndbapi/NdbFactory.i'
=== renamed file 'interface/NdbIndexOperation.i' =>
'interface/ndbapi/NdbIndexOperation.i'
=== renamed file 'interface/NdbIndexScanOperation.i' =>
'interface/ndbapi/NdbIndexScanOperation.i'
=== renamed file 'interface/NdbLogEvent.i' => 'interface/mgmapi/NdbLogEvent.i'
=== renamed file 'interface/NdbLogEventManager.i' =>
'interface/mgmapi/NdbLogEventManager.i'
=== renamed file 'interface/NdbMgm.i' => 'interface/mgmapi/NdbMgm.i'
=== renamed file 'interface/NdbMgmFactory.i' => 'interface/mgmapi/NdbMgmFactory.i'
=== renamed file 'interface/NdbMgmReply.i' => 'interface/mgmapi/NdbMgmReply.i'
=== renamed file 'interface/NdbOperation.i' => 'interface/ndbapi/NdbOperation.i'
=== renamed file 'interface/NdbRecAttr.i' => 'interface/ndbapi/NdbRecAttr.i'
=== renamed file 'interface/NdbScanFilter.i' => 'interface/ndbapi/NdbScanFilter.i'
=== renamed file 'interface/NdbScanOperation.i' =>
'interface/ndbapi/NdbScanOperation.i'
=== renamed file 'interface/NdbTransaction.i' => 'interface/ndbapi/NdbTransaction.i'
--- a/interface/NdbTransaction.i	2007-10-31 15:04:37 +0000
+++ b/interface/ndbapi/NdbTransaction.i	2007-11-06 22:59:00 +0000
@@ -15,6 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 %delobject NdbTransaction::close;

=== renamed file 'interface/NodeState.i' => 'interface/mgmapi/NodeState.i'
=== renamed file 'interface/mgmglobals.i' => 'interface/mgmapi/mgmglobals.i'
=== renamed file 'interface/ndbglobals.i' => 'interface/ndbapi/ndbglobals.i'
=== modified file 'configure.in'
--- a/configure.in	2007-11-06 20:11:50 +0000
+++ b/configure.in	2007-11-06 22:59:00 +0000
@@ -93,26 +93,17 @@
 
 WITH_RUBY()
 
+SWIG_NDB_SOURCES="\${top_srcdir}/interface/globals.i "
+SWIG_MGM_SOURCES="\${top_srcdir}/interface/globals.i "
+
+for f in `find interface/ndbapi` ; do  
+  SWIG_NDB_SOURCES="\${top_srcdir}/$f ${SWIG_NDB_SOURCES} "
+done
+for f in `find interface/mgmapi` ; do  
+  SWIG_MGM_SOURCES="\${top_srcdir}/$f ${SWIG_MGM_SOURCES} "
+done
   
-SWIG_SOURCES="\${top_srcdir}/interface/globals.i \
-              \${top_srcdir}/interface/NdbMgm.i \
-              \${top_srcdir}/interface/NdbError.i \
-              \${top_srcdir}/interface/NdbRecAttr.i \
-              \${top_srcdir}/interface/Ndb.i \
-              \${top_srcdir}/interface/NdbScanOperation.i \
-              \${top_srcdir}/interface/NdbClusterConnection.i \
-              \${top_srcdir}/interface/NdbOperation.i \
-              \${top_srcdir}/interface/NdbTransaction.i \
-              \${top_srcdir}/interface/ClusterState.i \
-              \${top_srcdir}/interface/NdbBlob.i \
-              \${top_srcdir}/interface/NdbDictionary.i \
-              \${top_srcdir}/interface/NdbEventOperation.i \
-              \${top_srcdir}/interface/NdbFactory.i \
-              \${top_srcdir}/interface/NdbMgmFactory.i \
-              \${top_srcdir}/interface/NdbMgmReply.i \
-              \${top_srcdir}/interface/NdbIndexScanOperation.i \
-              \${top_srcdir}/interface/NdbScanFilter.i \
-              "
+SWIG_SOURCES="${SWIG_MGM_SOURCES} ${SWIG_NDB_SOURCES}"
 
 SWIG_DIR="\${top_srcdir}/interface"
 
@@ -134,6 +125,8 @@
 
 AC_SUBST(MYSQL_INCLUDES)
 AC_SUBST(SWIG_SOURCES)
+AC_SUBST(SWIG_NDB_SOURCES)
+AC_SUBST(SWIG_MGM_SOURCES)
 AC_SUBST(SWIG_DIR)
 AC_SUBST(PERLCCFLAGS)
 AC_SUBST(PERLCPPFLAGS)

=== modified file 'csharp/Makefile.am'
--- a/csharp/Makefile.am	2007-11-05 18:12:57 +0000
+++ b/csharp/Makefile.am	2007-11-06 22:59:00 +0000
@@ -22,6 +22,10 @@
 #.PRECIOUS: %.cpp %.so %.dll
 #/usr/bin/objcopy --set-section-flags .debug_str=contents,debug $@
 
+ndbapi.cpp: ${SWIG_NDB_SOURCES}
+
+mgmapi.cpp: ${SWIG_MGM_SOURCES}
+
 .i.cpp: ${SWIG_SOURCES}
 	@mkdir -p $*
 	${SWIG} -csharp -dllimport libndbsharp -namespace MySql.Cluster.NdbApi \

=== modified file 'csharp/ndbapi.i'
--- a/csharp/ndbapi.i	2007-11-05 18:12:57 +0000
+++ b/csharp/ndbapi.i	2007-11-06 22:59:00 +0000
@@ -203,8 +203,8 @@
 %}
 
 
-%include "ndbglobals.i"
-%include "NdbFactory.i"
+%include "ndbapi/ndbglobals.i"
+%include "ndbapi/NdbFactory.i"
 
 %{
 #include <stdio.h>
@@ -277,25 +277,25 @@
 } ndberror_classification_enum;
 
 
-%include "NdbClusterConnection.i"
-%include "NdbDictionary.i"
-%include "Ndb.i"
-
-
-
-%include "NdbTransaction.i"
-
-
-
-%include "NdbOperation.i"
-%include "NdbScanOperation.i"
-%include "NdbIndexOperation.i"
-%include "NdbIndexScanOperation.i"
-%include "NdbEventOperation.i"
-%include "NdbRecAttr.i"
-%include "NdbError.i"
-
-%include "NdbBlob.i"
-%include "NdbScanFilter.i"
+%include "ndbapi/NdbClusterConnection.i"
+%include "ndbapi/NdbDictionary.i"
+%include "ndbapi/Ndb.i"
+
+
+
+%include "ndbapi/NdbTransaction.i"
+
+
+
+%include "ndbapi/NdbOperation.i"
+%include "ndbapi/NdbScanOperation.i"
+%include "ndbapi/NdbIndexOperation.i"
+%include "ndbapi/NdbIndexScanOperation.i"
+%include "ndbapi/NdbEventOperation.i"
+%include "ndbapi/NdbRecAttr.i"
+%include "ndbapi/NdbError.i"
+
+%include "ndbapi/NdbBlob.i"
+%include "ndbapi/NdbScanFilter.i"
 
 

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-04 21:32:20 +0000
+++ b/java/Makefile.am	2007-11-06 22:59:00 +0000
@@ -3,8 +3,8 @@
 NDBAPI_BUILT_SRC = ndbj.cxx
 MGMAPI_BUILT_SRC = mgmj.cxx
 BUILT_SOURCES = $(NDBAPI_BUILT_SRC) $(MGMAPI_BUILT_SRC)
-NDBAPI_SWIG_SRC = ndbj.i $(SWIG_SOURCES)
-MGMAPI_SWIG_SRC = mgmj.i $(SWIG_DIR)/mgm.i
+NDBAPI_SWIG_SRC = ndbj.i $(SWIG_NDB_SOURCES)
+MGMAPI_SWIG_SRC = mgmj.i $(SWIG_MGM_SOURCES)
 CLEANFILES = $(BUILT_SOURCES) *class *log ndbj.jar ndbj.h mgmj.h
 
 lib_LTLIBRARIES = libndbj.la libmgmj.la
@@ -27,9 +27,11 @@
 	( cd $(top_srcdir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
 	touch swig-stamp
 
-ndbj.cxx: swig-stamp
-
-.i.cxx: swig-stamp
+ndbj.cxx: swig-stamp ${NDBAPI_SWIG_SRC}
+
+mgmj.cxx: swig-stamp ${MGMAPI_SWIG_SRC}
+
+.i.cxx: swig-stamp 
 	$(SWIG) -java -outdir ${package_namespace}/$* -package `echo ${package_namespace}/$* |
sed 's,/,.,g'` -I$(SWIG_DIR) -I./swig $(MYSQL_INCLUDES) $(DEFAULT_INCLUDES) -o $@ $<
 
 ndbj.jar: libndbj.la libmgmj.la

=== modified file 'java/mgmj.i'
--- a/java/mgmj.i	2007-09-25 18:59:34 +0000
+++ b/java/mgmj.i	2007-11-06 22:59:00 +0000
@@ -51,11 +51,11 @@
 %rename NdbMgm              NdbMgmRef;
 */
 
-%include "mgmglobals.i"
-%include "NdbLogEvent.i"
-%include "NdbLogEventManager.i"
-%include "NdbMgm.i"
-%include "NdbMgmFactory.i"
-%include "ClusterState.i"
-%include "NodeState.i"
-%include "NdbMgmReply.i"
+%include "mgmapi/mgmglobals.i"
+%include "mgmapi/NdbLogEvent.i"
+%include "mgmapi/NdbLogEventManager.i"
+%include "mgmapi/NdbMgm.i"
+%include "mgmapi/NdbMgmFactory.i"
+%include "mgmapi/ClusterState.i"
+%include "mgmapi/NodeState.i"
+%include "mgmapi/NdbMgmReply.i"

=== modified file 'java/ndbj.i'
--- a/java/ndbj.i	2007-11-04 21:32:20 +0000
+++ b/java/ndbj.i	2007-11-06 22:59:00 +0000
@@ -33,7 +33,7 @@
 %rename NdbTransaction NdbTransactionImpl;
 
 
-%include "ndbglobals.i"
+%include "ndbapi/ndbglobals.i"
 %include "various.i"
 %include "enums.swg"
 
@@ -320,7 +320,7 @@
 
 %typemap(javainterfaces) Ndb_cluster_connection "NdbClusterConnection";
 
-%include "NdbClusterConnection.i"
+%include "ndbapi/NdbClusterConnection.i"
 
 %typemap(javainterfaces) Ndb "Ndb"; 
 
@@ -367,8 +367,8 @@
 */
 %javamethodmodifiers Ndb::closeTransaction "protected";
 
-%include "Ndb.i"
-%include "NdbDictionary.i"
+%include "ndbapi/Ndb.i"
+%include "ndbapi/NdbDictionary.i"
 
 %typemap(javainterfaces) NdbTransaction "NdbTransaction";
 
@@ -398,7 +398,7 @@
   }
 %}
 
-%include "NdbTransaction.i"
+%include "ndbapi/NdbTransaction.i"
 
 %extend NdbTransaction { 
   
@@ -507,7 +507,7 @@
 }
 
 
-%include "NdbOperation.i"
+%include "ndbapi/NdbOperation.i"
 
 %typemap(jstype) NdbScanOperation::ScanFlag "NdbScanOperation.ScanFlag"
 %typemap(javaout) NdbScanOperation::ScanFlag { 
@@ -543,11 +543,11 @@
 
   %}
 
-%include "NdbScanOperation.i"
+%include "ndbapi/NdbScanOperation.i"
 
 %typemap(javainterfaces) NdbIndexOperation "NdbIndexOperation";
 
-%include "NdbIndexOperation.i"
+%include "ndbapi/NdbIndexOperation.i"
 
 %typemap(jstype) NdbIndexScanOperation::BoundType "NdbIndexScanOperation.BoundType"
 %typemap(javaout) NdbIndexScanOperation::BoundType { 
@@ -555,7 +555,7 @@
 }
 %typemap(javainterfaces) NdbIndexScanOperation "NdbIndexScanOperation";
 
-%include "NdbIndexScanOperation.i"
+%include "ndbapi/NdbIndexScanOperation.i"
 
 %javamethodmodifiers NdbEventOperation::getValue "protected";
 %javamethodmodifiers NdbEventOperation::getPreValue "protected";
@@ -570,11 +570,11 @@
 }
 
 
-%include "NdbEventOperation.i"
+%include "ndbapi/NdbEventOperation.i"
 
 %typemap(javainterfaces) NdbRecAttr "NdbRecAttr"; 
 
-%include "NdbRecAttr.i"
+%include "ndbapi/NdbRecAttr.i"
 
 %typemap(javacode)  NdbBlob %{
 
@@ -597,8 +597,8 @@
         return NdbBlob.State.swigToEnum(ndbjJNI.NdbBlobImpl_getState(swigCPtr, this));
 }
 
-%include "NdbBlob.i"
+%include "ndbapi/NdbBlob.i"
 %include "NdbErrorDoc.i"
-%include "NdbError.i"
-%include "NdbScanFilter.i"
+%include "ndbapi/NdbError.i"
+%include "ndbapi/NdbScanFilter.i"
 

=== modified file 'lua/Makefile.am'
--- a/lua/Makefile.am	2007-10-11 08:35:50 +0000
+++ b/lua/Makefile.am	2007-11-06 22:59:00 +0000
@@ -1,15 +1,19 @@
 # -*- Mode: Makefile -*-
 
-luaarchdir=/usr/local/lub/lua
+luaarchdir=${libdir}/lua
 luaarch_DATA=ndbapi.so
 
 CLEANFILES=*.db test-out.rdf core* \
-	$(rubyarch_DATA) ndbapi.cpp
+	$(luaarch_DATA) ndbapi.cpp
 
-SWIG_OPTS=-I$(srcdir) -I$(SWIG_DIR) @MYSQL_INCLUDES@ 
+SWIG_OPTS=-I$(top_srcdir) -I$(srcdir) -I$(SWIG_DIR) @MYSQL_INCLUDES@ 
 
 SUFFIXES = .cpp .i .so .o
 
+ndbapi.cpp: $(SWIG_NDB_SOURCES) 
+
+mgmapi.cpp: $(SWIG_MGM_SOURCES)
+
 .i.cpp: $(SWIG_SOURCES)
 	$(SWIG) -c++ -lua $(SWIG_OPTS) -o $@ $<
 

=== modified file 'lua/ndbapi.i'
--- a/lua/ndbapi.i	2007-07-27 22:11:44 +0000
+++ b/lua/ndbapi.i	2007-11-06 22:59:00 +0000
@@ -21,27 +21,28 @@
    custom code is really clean anyway. */
 %module ndbapi
 
-%include "ndbglobals.i"
+%include "ndbapi/ndbglobals.i"
 
 //#define NDB_exception(code,msg) do { ndb_raise_exception(code, msg); SWIG_fail; }
while(0);
 #define NDB_exception(code,msg) do { SWIG_fail; } while(0);
-
-%include "NdbFactory.i"
-%include "NdbClusterConnection.i"
-%include "Ndb.i"
-%include "NdbDictionary.i"
-%include "NdbTransaction.i"
-
-%include "NdbOperation.i"
-%include "NdbScanOperation.i"
-%include "NdbIndexOperation.i"
-%include "NdbIndexScanOperation.i"
-%include "NdbEventOperation.i"
-
-%include "NdbRecAttr.i"
-%include "NdbError.i"
-%include "NdbBlob.i"
-%include "NdbScanFilter.i"
+#define NDB_exception_err(code,msg,err) do { SWIG_fail; } while(0);
+
+%include "ndbapi/NdbFactory.i"
+%include "ndbapi/NdbClusterConnection.i"
+%include "ndbapi/Ndb.i"
+%include "ndbapi/NdbDictionary.i"
+%include "ndbapi/NdbTransaction.i"
+
+%include "ndbapi/NdbOperation.i"
+%include "ndbapi/NdbScanOperation.i"
+%include "ndbapi/NdbIndexOperation.i"
+%include "ndbapi/NdbIndexScanOperation.i"
+%include "ndbapi/NdbEventOperation.i"
+
+%include "ndbapi/NdbRecAttr.i"
+%include "ndbapi/NdbError.i"
+%include "ndbapi/NdbBlob.i"
+%include "ndbapi/NdbScanFilter.i"
 
 
 

=== modified file 'perl/Makefile.am'
--- a/perl/Makefile.am	2007-11-05 18:12:57 +0000
+++ b/perl/Makefile.am	2007-11-06 22:59:00 +0000
@@ -13,16 +13,16 @@
 
 SWIG_OPTS=-perl5 $(DEFS) -outdir lib/mysql/cluster -I${top_srcdir} -I$(SWIG_DIR)
-I$(srcdir)/swig $(MYSQL_INCLUDES)
 
-ndbapi/ndbapi_wrap.cpp lib/mysql/cluster/ndbapi.pm: ndbapi.i  $(SWIG_SOURCES) 
+ndbapi/ndbapi_wrap.cpp lib/mysql/cluster/ndbapi.pm: ndbapi.i  $(SWIG_NDB_SOURCES) 
 	mkdir -p lib/mysql/cluster
 	$(SWIG) $(SWIG_OPTS) -o ndbapi/ndbapi_wrap.cpp ndbapi.i
 
-mgmapi/mgmapi_wrap.cpp lib/mysql/cluster/mgmapi.pm: mgmapi.i  $(SWIG_SOURCES) 
+mgmapi/mgmapi_wrap.cpp lib/mysql/cluster/mgmapi.pm: mgmapi.i  $(SWIG_MGM_SOURCES) 
 	mkdir -p lib/mysql/cluster
 	$(SWIG) $(SWIG_OPTS) -o mgmapi/mgmapi_wrap.cpp mgmapi.i
 
 $(PERL_MAKEFILE): $(srcdir)/Makefile.PL ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
lib/mysql/cluster/ndbapi.pm lib/mysql/cluster/mgmapi.pm $(srcdir)/Makefile.am
-	CFLAGS="$(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)" LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)"
$(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
+	CFLAGS="$(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)" LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)
$(LIBS)" $(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
 	
 -perl install-perl: $(PERL_MAKEFILE)
 	@target=`echo $@ | sed -e 's/-perl//'`; \

=== modified file 'perl/mgmapi.i'
--- a/perl/mgmapi.i	2007-11-05 18:12:57 +0000
+++ b/perl/mgmapi.i	2007-11-06 22:59:00 +0000
@@ -19,7 +19,7 @@
 
 %module "mysql::cluster::mgmapi"
 
-%include "globals.i"
+%include "mgmapi/mgmglobals.i"
 %{
 #undef SWIG_exception
 #define SWIG_exception(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0)
@@ -30,5 +30,5 @@
 
 %}
 
-%include "mgmglobals.i"
+%include "mgmapi/mgmglobals.i"
 //%include "NdbMgm.i"

=== modified file 'perl/mgmapi/Makefile.PL'
--- a/perl/mgmapi/Makefile.PL	2007-04-15 08:50:19 +0000
+++ b/perl/mgmapi/Makefile.PL	2007-11-06 22:59:00 +0000
@@ -13,7 +13,7 @@
 
     'DEFINE'    => "-DHAVE_CONFIG_H $CFLAGS",
     'OBJECT'    => "mgmapi_wrap.o",
-    'dynamic_lib' => {'OTHERLDFLAGS' => "$CFLAGS $LDFLAGS -L/usr/local/mysql/lib
-lstdc++ -lndbclient -lmysqlclient -lmysys"},
+    'dynamic_lib' => {'OTHERLDFLAGS' => "$CFLAGS $LDFLAGS -lstdc++"},
 
 
     'MAKEFILE'  => 'Makefile.perl',

=== modified file 'perl/ndbapi.i'
--- a/perl/ndbapi.i	2007-11-05 18:12:57 +0000
+++ b/perl/ndbapi.i	2007-11-06 22:59:00 +0000
@@ -19,7 +19,7 @@
 
 %module "mysql::cluster::ndbapi"
 
-%include "ndbglobals.i"
+%include "ndbapi/ndbglobals.i"
 %{
 
 #define NDB_exception(excp, msg) do { sv_setpvf(GvSV(PL_errgv),#excp " %s\n", msg);
SWIG_fail; } while (0)
@@ -29,7 +29,7 @@
 
 %}
 %include "perl_callback_typemap.i"
-%include "NdbFactory.i"
+%include "ndbapi/NdbFactory.i"
 
 %feature("shadow") Ndb_cluster_connection::createNdb(const char* aCatalogName="", const
char* aSchemaName="def")
 %{
@@ -41,23 +41,23 @@
         return $ndb;
     } 
 %}
-%include "NdbClusterConnection.i"
-
-
-
-
-%include "Ndb.i"
-%include "NdbDictionary.i"
-%include "NdbTransaction.i"
+%include "ndbapi/NdbClusterConnection.i"
+
+
+
+
+%include "ndbapi/Ndb.i"
+%include "ndbapi/NdbDictionary.i"
+%include "ndbapi/NdbTransaction.i"
 %include "perl_extend_ndbtransaction_async.i"
-%include "NdbOperation.i"
-%include "NdbScanOperation.i"
-%include "NdbIndexOperation.i"
-%include "NdbIndexScanOperation.i"
-%include "NdbEventOperation.i"
+%include "ndbapi/NdbOperation.i"
+%include "ndbapi/NdbScanOperation.i"
+%include "ndbapi/NdbIndexOperation.i"
+%include "ndbapi/NdbIndexScanOperation.i"
+%include "ndbapi/NdbEventOperation.i"
  //%include "perl_ndbrecattr_typemap.i" 
-%include "NdbRecAttr.i"
+%include "ndbapi/NdbRecAttr.i"
 %include "perl_extend_ndbrecattr.i"
-%include "NdbError.i"
-%include "NdbBlob.i"
-%include "NdbScanFilter.i"
+%include "ndbapi/NdbError.i"
+%include "ndbapi/NdbBlob.i"
+%include "ndbapi/NdbScanFilter.i"

=== modified file 'perl/ndbapi/Makefile.PL'
--- a/perl/ndbapi/Makefile.PL	2007-04-15 08:50:19 +0000
+++ b/perl/ndbapi/Makefile.PL	2007-11-06 22:59:00 +0000
@@ -13,7 +13,7 @@
 
     'DEFINE'    => "-DHAVE_CONFIG_H $CFLAGS",
     'OBJECT'    => "ndbapi_wrap.o",
-    'dynamic_lib' => {'OTHERLDFLAGS' => "$CFLAGS $LDFLAGS -L/usr/local/mysql/lib
-lstdc++ -lndbclient -lmysqlclient -lmysys"},
+    'dynamic_lib' => {'OTHERLDFLAGS' => "$CFLAGS $LDFLAGS -lstdc++"},
 
     'MAKEFILE'  => 'Makefile.perl',
     'clean' => { FILES => "ndbapi_wrap.cpp ndbapi_wrap.o ndbapi.bs" },

=== modified file 'python/Makefile.am'
--- a/python/Makefile.am	2007-11-04 21:32:20 +0000
+++ b/python/Makefile.am	2007-11-06 22:59:00 +0000
@@ -6,8 +6,11 @@
 
 SWIG_OPTS=-O -I$(srcdir) -I$(top_srcdir) -I$(SWIG_DIR) @MYSQL_INCLUDES@ -outdir
mysql/cluster
 
-
-SUFFIXES = .cxx .i
+ndbapi.cpp: ${SWIG_NDB_SOURCES} ndbapi.i
+
+mgmapi.cpp: ${SWIG_MGM_SOURCES} mgmapi.i
+
+SUFFIXES = .cpp .i
 
 .i.cpp: $(SWIG_SOURCES)
 	$(SWIG) -c++ -python $(SWIG_OPTS) -o $@ $<

=== modified file 'python/mgmapi.i'
--- a/python/mgmapi.i	2007-10-27 09:26:42 +0000
+++ b/python/mgmapi.i	2007-11-06 22:59:00 +0000
@@ -19,14 +19,14 @@
 
 %module mgmapi
 
-%include "mgmglobals.i"
-%include "NdbLogEvent.i"
-%include "NdbLogEventManager.i"
-%include "NdbMgm.i"
-%include "NdbMgmFactory.i"
-%include "ClusterState.i"
-%include "NodeState.i"
-%include "NdbMgmReply.i"
+%include "mgmapi/mgmglobals.i"
+%include "mgmapi/NdbLogEvent.i"
+%include "mgmapi/NdbLogEventManager.i"
+%include "mgmapi/NdbMgm.i"
+%include "mgmapi/NdbMgmFactory.i"
+%include "mgmapi/ClusterState.i"
+%include "mgmapi/NodeState.i"
+%include "mgmapi/NdbMgmReply.i"
 
 extern int ndb_init(void);
 

=== modified file 'python/ndbapi.i'
--- a/python/ndbapi.i	2007-11-04 21:32:20 +0000
+++ b/python/ndbapi.i	2007-11-06 22:59:00 +0000
@@ -19,7 +19,7 @@
 
 %module ndbapi
 
-%include "ndbglobals.i"
+%include "ndbapi/ndbglobals.i"
 
 
 
@@ -186,15 +186,15 @@
   
   %}
 
-%include "NdbFactory.i"
-
-%include "NdbClusterConnection.i"
-
-
-%include "Ndb.i"
-%include "NdbDictionary.i"
-
-%include "NdbTransaction.i" 
+%include "ndbapi/NdbFactory.i"
+
+%include "ndbapi/NdbClusterConnection.i"
+
+
+%include "ndbapi/Ndb.i"
+%include "ndbapi/NdbDictionary.i"
+
+%include "ndbapi/NdbTransaction.i" 
 
 
 
@@ -222,15 +222,15 @@
 
 %}
 
-%include "NdbOperation.i"
-
-%include "NdbScanOperation.i"
-%include "NdbIndexOperation.i"
-%include "NdbIndexScanOperation.i"
-%include "NdbEventOperation.i"
-
-
-%include "NdbRecAttr.i"
+%include "ndbapi/NdbOperation.i"
+
+%include "ndbapi/NdbScanOperation.i"
+%include "ndbapi/NdbIndexOperation.i"
+%include "ndbapi/NdbIndexScanOperation.i"
+%include "ndbapi/NdbEventOperation.i"
+
+
+%include "ndbapi/NdbRecAttr.i"
 
 %extend NdbRecAttr {
 
@@ -263,9 +263,9 @@
 
 };
 
-%include "NdbError.i"
-%include "NdbBlob.i"
-%include "NdbScanFilter.i"
+%include "ndbapi/NdbError.i"
+%include "ndbapi/NdbBlob.i"
+%include "ndbapi/NdbScanFilter.i"
 
 
 %pythoncode %{ 

=== modified file 'ruby/Makefile.am'
--- a/ruby/Makefile.am	2007-11-04 21:32:20 +0000
+++ b/ruby/Makefile.am	2007-11-06 22:59:00 +0000
@@ -10,6 +10,10 @@
 
 SUFFIXES = .cpp .o .so .i
 
+ndbapi.cpp: $(SWIG_NDB_SOURCES) ndbapi.i
+
+mgmapi.cpp: $(SWIG_MGM_SOURCES) mgmapi.i 
+
 .i.cpp: $(SWIG_SOURCES)
 	$(SWIG) -c++ -ruby -autorename $(SWIG_OPTS) -o $@ $<
 

=== modified file 'ruby/mgmapi.i'
--- a/ruby/mgmapi.i	2007-11-05 18:12:57 +0000
+++ b/ruby/mgmapi.i	2007-11-06 22:59:00 +0000
@@ -19,7 +19,7 @@
 
 %module "mgmapi"
 
-%include "mgmglobals.i"
+%include "mgmapi/mgmglobals.i"
 
 %typemap(in) int filter[] { 
   // Input will be array of tuples
@@ -106,4 +106,4 @@
 
 //%apply ndb_logevent *OUTPUT { ndb_logevent *dst };
 
-//%include "NdbMgm.i"
+//%include "mgmapi/NdbMgm.i"

=== modified file 'ruby/ndbapi.i'
--- a/ruby/ndbapi.i	2007-11-05 18:12:57 +0000
+++ b/ruby/ndbapi.i	2007-11-06 22:59:00 +0000
@@ -21,7 +21,7 @@
    custom code is really clean anyway. */
 %module ndbapi
 
-%include "ndbglobals.i"
+%include "ndbapi/ndbglobals.i"
 
 %typemap(in) (asynch_callback_t * cb) { 
 
@@ -157,23 +157,23 @@
 }
  %}
 
-%include "NdbFactory.i"
-%include "NdbClusterConnection.i"
-%include "Ndb.i"
-%include "NdbDictionary.i"
-%include "NdbTransaction.i"
-
-
-%include "NdbOperation.i"
-%include "NdbScanOperation.i"
-%include "NdbIndexOperation.i"
-%include "NdbIndexScanOperation.i"
-%include "NdbEventOperation.i"
-
-%include "NdbRecAttr.i"
-%include "NdbError.i"
-%include "NdbBlob.i"
-%include "NdbScanFilter.i"
+%include "ndbapi/NdbFactory.i"
+%include "ndbapi/NdbClusterConnection.i"
+%include "ndbapi/Ndb.i"
+%include "ndbapi/NdbDictionary.i"
+%include "ndbapi/NdbTransaction.i"
+
+
+%include "ndbapi/NdbOperation.i"
+%include "ndbapi/NdbScanOperation.i"
+%include "ndbapi/NdbIndexOperation.i"
+%include "ndbapi/NdbIndexScanOperation.i"
+%include "ndbapi/NdbEventOperation.i"
+
+%include "ndbapi/NdbRecAttr.i"
+%include "ndbapi/NdbError.i"
+%include "ndbapi/NdbBlob.i"
+%include "ndbapi/NdbScanFilter.i"