X-Git-Url: https://git.distorted.org.uk/~mdw/tripe-android/blobdiff_plain/3a2f1a4ba4cc824e192c9d144b317a215e79c8d6..7894831e9078211df0b460c4d3dd1bc51ca46804:/Makefile

diff --git a/Makefile b/Makefile
index 2cf811a..cd8e4a4 100644
--- 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
@@ -29,11 +29,17 @@ all::
 	$(call v_tag,CC)$(CC) -c $(CFLAGS) -MMD -o$@ $<
 CLEANFILES		+= *.o *.d
 
+CLASSDIR		 = cls/
 %.stamp: %.java
-	$(call v_tag,JAVAC)$(JAVAC) $(JAVAFLAGS) $< && echo built >$@
+	$(call v_tag,JAVAC)mkdir -p $(CLASSDIR) && \
+		$(JAVAC) -d $(CLASSDIR) -cp $(CLASSDIR) $(JAVAFLAGS) $< && \
+		echo built >$@
 %.stamp: %.scala
-	$(call v_tag,SCALAC)$(SCALAC) $(SCALAFLAGS) $< && echo built >$@
+	$(call v_tag,SCALAC)mkdir -p $(CLASSDIR) && \
+		$(SCALAC) -d $(CLASSDIR) -cp $(CLASSDIR) $(SCALAFLAGS) $< && \
+		echo built >$@
 CLEANFILES		+= *.stamp
+clean::; rm -rf $(CLASSDIR)
 
 objects			 = $(patsubst %.c,%$2,$1)
 
@@ -42,13 +48,13 @@ libtoy.so_SOURCES	 = jni.c
 libtoy.so: $(call objects,$(libtoy.so_SOURCES),.o)
 	$(call v_tag,LD)$(LD) $(LDFLAGS.so) -o$@ $^
 
-clean::; rm -rf uk/
-
 TARGETS			+= jni.stamp
 
 TARGETS			+= sock.stamp
 sock.stamp: jni.stamp
 
+TARGETS			+= admin.stamp
+
 TARGETS			+= main.stamp
 main.stamp: jni.stamp sock.stamp