From 2a02a846336b5f89794661b0569655b74ec1e509 Mon Sep 17 00:00:00 2001 Message-Id: <2a02a846336b5f89794661b0569655b74ec1e509.1715155069.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 17 May 2018 10:43:44 +0100 Subject: [PATCH] Makefile: Drop the classfile outputs down a level. Organization: Straylight/Edgeware From: Mark Wooding Now, if we add other paths, they'll all be together and we won't spread weirdness all over the toplevel. --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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) -- [mdw]