List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 21 2007 7:28pm
Subject:Rev 239: Merged $(*F) 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: 239
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 11:28:41 -0800
message:
  Merged $(*F) fix. 
modified:
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
    ------------------------------------------------------------
    revno: 192.1.25.1.60
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Wed 2007-11-21 11:26:17 -0800
    message:
      Fixed path weirdness due to builddir madness.
    modified:
      java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-21 18:32:05 +0000
+++ b/java/Makefile.am	2007-11-21 19:26:17 +0000
@@ -309,8 +309,8 @@
 	$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir) $<
 
 .i.cxx:  
-	@mkdir -p ${package_builddir}/$*
-	$(SWIG) -java -outdir ${builddir}/${package_namespace}/$* -package `echo
${package_namespace}/$* | sed 's,/,.,g'` -I$(SWIG_DIR) -I${srcdir}/swig $(MYSQL_INCLUDES)
$(DEFAULT_INCLUDES) -o $@ $<
+	@mkdir -p ${package_builddir}/$(*F)
+	$(SWIG) -java -outdir ${builddir}/${package_namespace}/$(*F) -package `echo
${package_namespace}/$(*F) | sed 's,/,.,g'` -I$(SWIG_DIR) -I${srcdir}/swig
$(MYSQL_INCLUDES) $(DEFAULT_INCLUDES) -o $@ $<
 
 # $(NDBAPI_JAVA_CLASSES) $(MGMAPI_JAVA_CLASSES)
 ndbj.jar: libndbj.la libmgmj.la $(NDBAPI_JAVA_SRC) $(MGMAPI_JAVA_SRC) $(NDBAPI_BUILT_J)
$(MGMAPI_BUILT_J)

Thread
Rev 239: Merged $(*F) fix. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor21 Nov