From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 22 Sep 2009 09:07:19 +0000 (+0200)
Subject: Fix build of JNI sources.
X-Git-Tag: v1.0~9
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=f97f4f89dd2548bff5db6af98275ca2901ffea74;p=yaz4j-moved-to-github.git

Fix build of JNI sources.

Fix build of JNI sources. Use the generate-sources phase.
---

diff --git a/libyaz4j/Makefile b/libyaz4j/Makefile
index d151414..ebbdb9c 100644
--- a/libyaz4j/Makefile
+++ b/libyaz4j/Makefile
@@ -6,6 +6,10 @@ YAZ_LIBS=`${YAZ_CONFIG} --libs`
 
 all: lib/libyaz4j.so
 
+.PHONY: generate-sources
+
+generate-sources: src/libyaz4j.cpp
+
 src/libyaz4j.cpp: libyaz4j.i
 	swig -I"include" -I"$(YAZ_PREFIX)/include" -outdir ../src/main/java/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
 
diff --git a/pom.xml b/pom.xml
index 92a7226..195d321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,21 @@
 	      <artifactId>maven-antrun-plugin</artifactId>
 	      <executions>
 		<execution>
+		  <id>native-sources</id>
+		  <phase>generate-sources</phase>
+		  <goals>
+		    <goal>run</goal>
+		  </goals>
+		  <configuration>
+		    <tasks>
+		      <exec dir="libyaz4j" executable="make" failonerror="true">
+			<arg value="generate-sources"/>
+		      </exec>
+		    </tasks>
+		  </configuration>
+		</execution>
+
+		<execution>
 		  <id>build-native</id>
 		  <phase>compile</phase>
 		  <goals>