From 318b81d59e6f34a92a7a78c0896aa331bc14d0a1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 17 Jul 2019 11:40:06 -0700 Subject: Use discovered java path for compiler and jni include files Instead of using the discovered java bits just for jni.h, also use javac from that directory. Add JAVA_VERSION param to set language version for newer compilers. Signed-off-by: Keith Packard --- map-server/altos-mapd/Makefile.am | 2 +- map-server/altos-mapj/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'map-server') diff --git a/map-server/altos-mapd/Makefile.am b/map-server/altos-mapd/Makefile.am index 315a33d5..bb20dd84 100644 --- a/map-server/altos-mapd/Makefile.am +++ b/map-server/altos-mapd/Makefile.am @@ -1,5 +1,5 @@ JAVAROOT=classes -AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6 +AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked altoslibdir=$(libdir)/altos diff --git a/map-server/altos-mapj/Makefile.am b/map-server/altos-mapj/Makefile.am index 98d4f170..a8dfffec 100644 --- a/map-server/altos-mapj/Makefile.am +++ b/map-server/altos-mapj/Makefile.am @@ -1,5 +1,5 @@ JAVAROOT=classes -AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6 +AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked altoslibdir=$(libdir)/altos -- cgit v1.2.3