From 9dc323e98722fca7ed4ac767bf9f6c721a66b3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 29 Apr 2018 16:56:17 +0200 Subject: [PATCH] For Java >= 8 use javac with option -h instead of javah MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- admin | 2 +- dcopjava/binding/Makefile.am | 4 +++- dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/admin b/admin index 04c35f89..0e86934f 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 04c35f89e0b556b38fa0ba19a8af6db426e59686 +Subproject commit 0e86934fc8d6ffab9867f67859c33ef33e83478f diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am index d5ad26ac..be90dd10 100644 --- a/dcopjava/binding/Makefile.am +++ b/dcopjava/binding/Makefile.am @@ -12,7 +12,9 @@ client.lo: org_trinitydesktop_DCOP_Client.h org_trinitydesktop_DCOP_Client.h: $(MAKE) -C org - $(JAVAH) -classpath .:$(srcdir) -jni org.trinitydesktop.DCOP.Client + if ! $(JAVA8); then \ + $(JAVAH) -classpath .:$(srcdir) -jni org.trinitydesktop.DCOP.Client; \ + fi SUBDIRS = org diff --git a/dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am b/dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am index 975d2826..06613c6d 100644 --- a/dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am +++ b/dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am @@ -4,6 +4,10 @@ classdir = $(kde_libraries)/java/org/trinitydesktop/DCOP SUFFIXES = .java .class .java.class: - CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java + if $(JAVA8); then \ + CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java -h ../../..; \ + else \ + CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/trinitydesktop/DCOP/$*.java; \ + fi CLEANFILES = $(class_DATA)