Makefile: Don't leave class-file placement to the `FOOFLAGS' variables.

[tripe-android] / Makefile

diff --git a/Makefile b/Makefile
index 2cf811a..7b74740 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ v_tag_0                  = @printf "  %-8s %s\n" "$1" "$@";
 V_AT                    = $(V_AT_$V)
 V_AT_0                  = @
 
-JDK                     = /usr/lib/jvm/java-8-openjdk-amd64
+JDK                     = /usr/lib/jvm/default-java
 JDK_PLAT                = linux
 INCLUDES                = $(JDK)/include $(JDK)/include/$(JDK_PLAT)
 
@@ -17,10 +17,10 @@ LD                   = gcc
 LDFLAGS.so              = -shared
 
 JAVAC                   = javac
-JAVAFLAGS               = -d .
+JAVAFLAGS               =
 
-SCALAC                  = scalac
-SCALAFLAGS              = -d . -optimise
+SCALAC                  = fsc
+SCALAFLAGS              = -optimise
 
 all::
 .PHONY: all
@@ -30,9 +30,9 @@ all::
 CLEANFILES             += *.o *.d
 
 %.stamp: %.java
-       $(call v_tag,JAVAC)$(JAVAC) $(JAVAFLAGS) $< && echo built >$@
+       $(call v_tag,JAVAC)$(JAVAC) -d . $(JAVAFLAGS) $< && echo built >$@
 %.stamp: %.scala
-       $(call v_tag,SCALAC)$(SCALAC) $(SCALAFLAGS) $< && echo built >$@
+       $(call v_tag,SCALAC)$(SCALAC) -d . $(SCALAFLAGS) $< && echo built >$@
 CLEANFILES             += *.stamp
 
 objects                         = $(patsubst %.c,%$2,$1)