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 /libaltos | |
| 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 'libaltos')
| -rw-r--r-- | libaltos/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libaltos/Makefile.am b/libaltos/Makefile.am index 69fe7a57..eb5eb677 100644 --- a/libaltos/Makefile.am +++ b/libaltos/Makefile.am @@ -1,6 +1,5 @@ -JAVAC=javac AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux -AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6 +AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked altoslibdir=$(libdir)/altos |