diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-04-29 16:56:17 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-04-29 16:58:38 +0200 |
| commit | 12501858b4cd80b9348a7942af32b0d839398679 (patch) | |
| tree | 34a0a86684614cc67af324714e7b6362538dad41 | |
| parent | 38f7423b6275810b2ba55d032cbb1f925f69ff5b (diff) | |
| download | tdebindings-12501858b4cd80b9348a7942af32b0d839398679.tar.gz tdebindings-12501858b4cd80b9348a7942af32b0d839398679.zip | |
For Java >= 8 use javac with option -h instead of javah
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9dc323e98722fca7ed4ac767bf9f6c721a66b3f3)
| m--------- | admin | 0 | ||||
| -rw-r--r-- | dcopjava/binding/Makefile.am | 4 | ||||
| -rw-r--r-- | dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/admin b/admin -Subproject b5373d6ec2d9431fa6c1c218137f9e3f5ca1f4a +Subproject 5200a0cc9da98d7798aa80a7c35e29e70d4c292 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) |