Description: Fixes the build failure with Java 10
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/lib/alsa/Makefile.in
+++ b/src/lib/alsa/Makefile.in
@@ -10,7 +10,7 @@
 OSNAME=@OSNAME@
 ARCHNAME=@ARCHNAME@
 CC=@CC@
-CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -130,7 +130,6 @@
 
 $(JNIHEADERS): $(JNICLASSFILES)
 	$(RM_F) $(JNIHEADERS)
-	$(JAVAH) -d . $(JNICLASSES)
 
 .PHONY: install
 install:
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,7 @@
 JL_SRC = @JL_DIR@
 
 %.class: %.java
-	$(JAVAC) -classpath $(DEF_CLASSPATH):$(JL_SRC):src:$$CLASSPATH -d $(DESTDIR) $<
+	$(JAVAC) -h . -classpath $(DEF_CLASSPATH):$(JL_SRC):src:$$CLASSPATH -d $(DESTDIR) $<
 	@#export CLASSPATH=$(DEF_CLASSPATH):$(JL_SRC):src:$$CLASSPATH; $(JAVAC) -d $(DESTDIR) $<
 
 
--- a/build.xml
+++ b/build.xml
@@ -14,9 +14,11 @@
 
 
   <target name="compile" depends="prepare">
+    <mkdir dir="jni"/>
     <javac srcdir="${src}"
 		   debug="${debug}"
 		   source="${source}"
+		   nativeHeaderDir="jni"
 		   destdir="${build}"
 		   sourcepath="${src.classes}">
 	  <compilerarg compiler="kjc" value="-generic"/>
@@ -33,6 +35,7 @@
     <javac srcdir="${src.classes}"
 		   debug="${debug}"
 		   source="${source}"
+		   nativeHeaderDir="jni"
 		   destdir="${build}" >
 	  <compilerarg compiler="kjc" value="-generic"/>
 	  <compilerarg  value="-Xlint:unchecked"/>
--- a/src/lib/cdparanoia/Makefile.in
+++ b/src/lib/cdparanoia/Makefile.in
@@ -10,7 +10,7 @@
 OSNAME=@OSNAME@
 ARCHNAME=@ARCHNAME@
 CC=@CC@
-CPPFLAGS=-g -Wall -I../common -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I../common -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -64,7 +64,6 @@
 
 $(JNIHEADERS): $(JNICLASSFILES)
 	$(RM_F) $(JNIHEADERS)
-	$(JAVAH) -d . $(JNICLASSES)
 
 .PHONY: install
 install:
--- a/src/lib/cooked_ioctl/Makefile.in
+++ b/src/lib/cooked_ioctl/Makefile.in
@@ -11,7 +11,7 @@
 ARCHNAME=@ARCHNAME@
 CC=@CC@
 CXX=@CC@ -x c
-CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -62,7 +62,6 @@
 
 $(JNIHEADERS): $(JNICLASSFILES)
 	$(RM_F) $(JNIHEADERS)
-	$(JAVAH) -d . $(JNICLASSES)
 
 .PHONY: install
 install:
--- a/src/lib/fluidsynth/Makefile.in
+++ b/src/lib/fluidsynth/Makefile.in
@@ -10,7 +10,7 @@
 OSNAME=@OSNAME@
 ARCHNAME=@ARCHNAME@
 CC=@CC@
-CPPFLAGS=-g -Wall -I"$(JAVADIR)/include" -I"$(JAVADIR)/include/$(OSNAME)" -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I"$(JAVADIR)/include" -I"$(JAVADIR)/include/$(OSNAME)" -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -81,7 +81,6 @@
 
 $(JNIHEADERS): $(JNICLASSFILES)
 	$(RM_F) $(JNIHEADERS)
-	$(JAVAH) -d . $(JNICLASSES)
 
 .PHONY: install
 install:
--- a/src/lib/pvorbis/Makefile.in
+++ b/src/lib/pvorbis/Makefile.in
@@ -10,7 +10,7 @@
 OSNAME=@OSNAME@
 ARCHNAME=@ARCHNAME@
 CC=@CC@
-CPPFLAGS=-g -Wall -I. -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I. -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -101,7 +101,6 @@
 
 $(JNIHEADERS): $(JNICLASSFILES)
 	$(RM_F) $(JNIHEADERS)
-	$(JAVAH) -d . $(JNICLASSES)
 
 .PHONY: install
 install:
--- a/src/lib/vorbis/Makefile.in
+++ b/src/lib/vorbis/Makefile.in
@@ -10,7 +10,7 @@
 OSNAME=@OSNAME@
 ARCHNAME=@ARCHNAME@
 CC=@CC@
-CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC -D_REENTRANT #-pedantic
+CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -I../../../jni/ -fPIC -D_REENTRANT #-pedantic
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -87,7 +87,6 @@
 
 $(JNIHEADERS): $(JNICLASSFILES)
 	$(RM_F) $(JNIHEADERS)
-	$(JAVAH) -d . $(JNICLASSES)
 
 .PHONY: install
 install: