Avoid redundant YAZ includes.

diff --git a/libyaz4j/build.sh b/libyaz4j/build.sh
index 05768a5..36574a0 100755 (executable)
--- a/libyaz4j/build.sh
+++ b/libyaz4j/build.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 JNI_DIR=${JAVA_HOME}/include
 
-swig -I"include" -I"../dependencies/yaz-2.1.28/include/yaz/" -outdir ../src/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
+swig -I"include" -I"../dependencies/yaz-2.1.28/include" -outdir ../src/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
 
-g++ -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" -I"../dependencies/yaz-2.1.28/include/yaz" -I"../dependencies/yaz-2.1.28/include" -c -Wall -o obj/libyaz4j.o src/libyaz4j.cpp
+g++ -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" -I"../dependencies/yaz-2.1.28/include" -c -Wall -o obj/libyaz4j.o src/libyaz4j.cpp
 
-g++ -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" -I"../dependencies/yaz-2.1.28/include/yaz" -I"../dependencies/yaz-2.1.28/include" -c -Wall -o obj/zoom-extra.o src/zoom-extra.cpp
+g++ -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" -I"../dependencies/yaz-2.1.28/include" -c -Wall -o obj/zoom-extra.o src/zoom-extra.cpp
 
 g++ -L"../dependencies/yaz-2.1.28/lib" -shared obj/libyaz4j.o obj/zoom-extra.o -lyaz -o lib/libyaz4j.so
 

diff --git a/libyaz4j/include/zoom-extra.h b/libyaz4j/include/zoom-extra.h
index 3aedc97..3b39133 100644 (file)
--- a/libyaz4j/include/zoom-extra.h
+++ b/libyaz4j/include/zoom-extra.h
@@ -1,6 +1,6 @@
 #ifndef INCLUDED_WRAPPER
 #define INCLUDED_WRAPPER
-#include <zoom.h>
+#include <yaz/zoom.h>
 typedef struct CharStarByteArray
 {
        char* data;

diff --git a/libyaz4j/libyaz4j.i b/libyaz4j/libyaz4j.i
index 1bac4d7..d75a915 100644 (file)
--- a/libyaz4j/libyaz4j.i
+++ b/libyaz4j/libyaz4j.i
@@ -2,7 +2,7 @@
 %module yaz4jlib
        %{
                #include "zoom-extra.h"
-               #include <zoom.h>
+               #include <yaz/zoom.h>
        %}
        %include "typemaps.i"
        %include "arrays_java.i"
@@ -19,5 +19,5 @@
        %define YAZ_BEGIN_CDECL %enddef
        %define YAZ_END_CDECL %enddef
        %include "zoom-extra.h"
-       %include <zoom.h>
+       %include <yaz/zoom.h>
 

diff --git a/libyaz4j/src/zoom-extra.cpp b/libyaz4j/src/zoom-extra.cpp
index 343103a..0521686 100644 (file)
--- a/libyaz4j/src/zoom-extra.cpp
+++ b/libyaz4j/src/zoom-extra.cpp
@@ -1,5 +1,4 @@
 #include "zoom-extra.h"
-#include <zoom.h>
 #include <string.h>
 
 struct CharStarByteArray ZOOM_record_get_bytes(ZOOM_record rec, const char *type, int *len)