List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:December 5 2007 2:06am
Subject:Rev 330: Fixed the swig depend for making NDB/J in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 330
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Tue 2007-12-04 18:06:04 -0800
message:
  Fixed the swig depend for making NDB/J
modified:
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
=== modified file 'configure.in'
--- a/configure.in	2007-12-05 00:49:51 +0000
+++ b/configure.in	2007-12-05 02:06:04 +0000
@@ -39,14 +39,17 @@
 AC_PROG_SWIG(1.3.32)
 AS_IF([test "x$SWIG" = "xno"],[
   SWIG_LIB="\${top_srcdir}/swig/SWIG/Lib"
-  SWIG="SWIG_LIB=${SWIG_LIB} \${top_builddir}/swig/SWIG/swig"
+  SWIG_BIN="\${top_builddir}/swig/SWIG/swig"
+  SWIG="SWIG_LIB=${SWIG_LIB} ${SWIG_BIN}"
   build_swig=yes
 ],[
   build_swig=no
+  SWIG_BIN="${SWIG}"
 ])  
 SWIG_ENABLE_CXX()
 AC_SUBST(SWIG)
 AC_SUBST(SWIG_LIB)
+AC_SUBST(SWIG_BIN)
 
 
 

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-12-04 23:39:01 +0000
+++ b/java/Makefile.am	2007-12-05 02:06:04 +0000
@@ -317,19 +317,18 @@
 
 ${MGMAPI_BUILT_J}: mgmj.cxx
 
-#swig-stamp:
-#	( cd $(top_builddir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
-#	touch swig-stamp
-
-ndbj.cxx: ${NDBAPI_SWIG_SRC}
-
-mgmj.cxx: ${MGMAPI_SWIG_SRC}
+${SWIG_BIN}: 
+	( cd $(top_builddir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
+
+ndbj.cxx: ${NDBAPI_SWIG_SRC} ${SWIG_BIN}
+
+mgmj.cxx: ${MGMAPI_SWIG_SRC} ${SWIG_BIN}
 
 .java.class:
 	@mkdir -p `dirname $*`
 	$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir) $<
 
-.i.cxx:  
+.i.cxx: 
 	@mkdir -p ${package_builddir}/$(*F)
 	$(SWIG) -java -usejava5 -outdir ${builddir}/${package_namespace}/$(*F) -package `echo
${package_namespace}/$(*F) | sed 's,/,.,g'` -I$(SWIG_DIR) -I${srcdir}/swig
$(MYSQL_INCLUDES) $(DEFAULT_INCLUDES) -o $@ $<
 

Thread
Rev 330: Fixed the swig depend for making NDB/J in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor5 Dec