diff options
| author | Keith Packard <keithp@keithp.com> | 2019-07-17 11:40:06 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2019-07-17 11:40:06 -0700 |
| commit | 318b81d59e6f34a92a7a78c0896aa331bc14d0a1 (patch) | |
| tree | 2c54089f748c55c15b891c79e6e1901d0f18f630 /map-server | |
| parent | 784ccd37d051e8b88ef1b150ccb4e89103675b3e (diff) | |
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 <keithp@keithp.com>
Diffstat (limited to 'map-server')
| -rw-r--r-- | map-server/altos-mapd/Makefile.am | 2 | ||||
| -rw-r--r-- | map-server/altos-mapj/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
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 |