From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 17 May 2018 09:43:44 +0000 (+0100)
Subject: Makefile: Drop the classfile outputs down a level.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe-android/commitdiff_plain/2a02a846336b5f89794661b0569655b74ec1e509

Makefile: Drop the classfile outputs down a level.

Now, if we add other paths, they'll all be together and we won't spread
weirdness all over the toplevel.
---

diff --git a/Makefile b/Makefile
index c6391a1..873380a 100644
--- a/Makefile
+++ b/Makefile
@@ -29,12 +29,17 @@ all::
 	$(call v_tag,CC)$(CC) -c $(CFLAGS) -MMD -o$@ $<
 CLEANFILES		+= *.o *.d
 
+CLASSDIR		 = cls/
 %.stamp: %.java
-	$(call v_tag,JAVAC)$(JAVAC) -d . $(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) -d . $(SCALAFLAGS) $< && echo built >$@
+	$(call v_tag,SCALAC)mkdir -p $(CLASSDIR) && \
+		$(SCALAC) -d $(CLASSDIR) -cp $(CLASSDIR) $(SCALAFLAGS) $< && \
+		echo built >$@
 CLEANFILES		+= *.stamp
-clean::; rm -rf uk/
+clean::; rm -rf $(CLASSDIR)
 
 objects			 = $(patsubst %.c,%$2,$1)