summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-04-29 14:56:17 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2018-04-29 14:56:17 (GMT)
commit9dc323e98722fca7ed4ac767bf9f6c721a66b3f3 (patch)
tree74c6c8f155572668883a732ecfdc9874a5feaace
parentac567aa120f4632c03c4249bccf246fa4201307a (diff)
downloadtdebindings-9dc323e9.zip
tdebindings-9dc323e9.tar.gz
For Java >= 8 use javac with option -h instead of javah
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
m---------admin0
-rw-r--r--dcopjava/binding/Makefile.am4
-rw-r--r--dcopjava/binding/org/trinitydesktop/DCOP/Makefile.am6
3 files changed, 8 insertions, 2 deletions
diff --git a/admin b/admin
-Subproject 04c35f89e0b556b38fa0ba19a8af6db426e5968
+Subproject 0e86934fc8d6ffab9867f67859c33ef33e83478
diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
index d5ad26a..be90dd1 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 975d282..06613c6 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)