List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 21 2007 6:33pm
Subject:Rev 235: Merged new builddir fix. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 235
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Wed 2007-11-21 10:32:45 -0800
message:
  Merged new builddir fix.
modified:
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  swig/Makefile.am               makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
  swig/SWIG/Source/Makefile.am   makefile.am-20071104211339-fod7yzi8t7xd3g0w-108
  swig/SWIG/configure.in         configure.in-20071104211339-fod7yzi8t7xd3g0w-24
    ------------------------------------------------------------
    revno: 192.1.25.1.56
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Wed 2007-11-21 10:32:05 -0800
    message:
      Different fix for builddir issue.
    modified:
      java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
      swig/Makefile.am               makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
      swig/SWIG/Source/Makefile.am   makefile.am-20071104211339-fod7yzi8t7xd3g0w-108
      swig/SWIG/configure.in         configure.in-20071104211339-fod7yzi8t7xd3g0w-24
=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-17 21:15:41 +0000
+++ b/java/Makefile.am	2007-11-21 18:32:05 +0000
@@ -1,4 +1,5 @@
 package_namespace=com/mysql/cluster
+builddir=${top_builddir}/java
 package_builddir=$(builddir)/$(package_namespace)
 package_srcdir=$(srcdir)/$(package_namespace)
 ndbapi_examples_dir=$(package_namespace)/ndbapi/examples
@@ -90,6 +91,7 @@
 	${package_srcdir}/ndbj/NdbRecAttr.java \
 	${package_srcdir}/ndbj/NdbResultSet.java \
 	${package_srcdir}/ndbj/NdbResultSetImpl.java \
+	${package_srcdir}/ndbj/NdbResultSetMetaData.java \
 	${package_srcdir}/ndbj/NdbScanFilter.java \
 	${package_srcdir}/ndbj/NdbScanFilterImpl.java \
 	${package_srcdir}/ndbj/NdbScanOperation.java \
@@ -171,6 +173,7 @@
 	${package_builddir}/ndbj/NdbRecAttr.class \
 	${package_builddir}/ndbj/NdbResultSet.class \
 	${package_builddir}/ndbj/NdbResultSetImpl.class \
+	${package_builddir}/ndbj/NdbResultSetMetaData.class \
 	${package_builddir}/ndbj/NdbScanFilter.class \
 	${package_builddir}/ndbj/NdbScanFilterImpl.class \
 	${package_builddir}/ndbj/NdbScanOperation.class \

=== modified file 'swig/Makefile.am'
--- a/swig/Makefile.am	2007-11-16 05:43:29 +0000
+++ b/swig/Makefile.am	2007-11-21 18:32:05 +0000
@@ -1,11 +1,11 @@
 all-local: 
-	cd $(builddir)/SWIG && $(MAKE) $(AM_MAKEFLAGS)
+	cd $(top_builddir)/swig/SWIG && $(MAKE) $(AM_MAKEFLAGS)
 check-local: 
-	cd $(builddir)/SWIG && true #$(MAKE) $(AM_MAKEFLAGS) check
+	cd $(top_builddir)/swig/SWIG && true #$(MAKE) $(AM_MAKEFLAGS) check
 clean-local:
-	cd $(builddir)/SWIG && $(MAKE) $(AM_MAKEFLAGS) clean
+	cd $(top_builddir)/swig/SWIG && $(MAKE) $(AM_MAKEFLAGS) clean
 distclean: 
-	cd $(builddir)/SWIG && $(MAKE) $(AM_MAKEFLAGS) distclean
+	cd $(top_builddir)/swig/SWIG && $(MAKE) $(AM_MAKEFLAGS) distclean
 
 dist-hook:
 	mkdir $(distdir)/SWIG

=== modified file 'swig/SWIG/Source/Makefile.am'
--- a/swig/SWIG/Source/Makefile.am	2007-11-16 05:43:29 +0000
+++ b/swig/SWIG/Source/Makefile.am	2007-11-21 18:32:05 +0000
@@ -99,7 +99,7 @@
 # This occurs on each invocation of make and is a step towards providing support for
multiple 
 # build directories.
 all-local: eswig@EXEEXT@
-	cp -f $(srcdir)/eswig@EXEEXT@ $(builddir)/../swig@EXEEXT@
+	cp -f $(srcdir)/eswig@EXEEXT@ $(top_builddir)/swig@EXEEXT@
 
 clean-local:
 	rm -f ../swig@EXEEXT@

=== modified file 'swig/SWIG/configure.in'
--- a/swig/SWIG/configure.in	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/configure.in	2007-11-21 18:32:05 +0000
@@ -10,6 +10,10 @@
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 
+AS_IF([`echo $am__api_version | cut -f2 -d.` -lt 10],[
+builddir=`pwd`
+AC_SUBST(builddir)])
+
 dnl Some extra defines for the config file
 AH_BOTTOM([
 /* Default language */

Thread
Rev 235: Merged new builddir fix. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor21 Nov