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 c6391a17a385091777b8f921098cf47db57d9696..873380ac07e5edd9f0bb4368fc18ab27573d4953 100644 (file)
--- 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)