Séparation des programmes

Makefile

@@ -1,19 +1,10 @@
-# If the first argument is "run"...
-ifeq (run,$(firstword $(MAKECMDGOALS)))
-  # use the rest as arguments for "run"
-  RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
-  # ...and turn them into do-nothing targets
-  $(eval $(RUN_ARGS):;@:)
-endif
-
-### VARIABLES ###
 
 JC := javac
 JCFLAGS := -encoding UTF-8 -implicit:none
 JVM := java
 JVMFLAGS :=
 
-SRCDIR := ./src/GridSolver
+SRCDIR := ./src
 OUTDIR := ./out
 DOCDIR := ./doc
 SRC := $(wildcard $(SRCDIR)/*.java)
@@ -25,11 +16,13 @@ $(OUTDIR)/%.class : $(SRCDIR)/%.java
 	@mkdir -p $(@D)
 	${JC} ${JCFLAGS} -cp $(SRCDIR) -d $(OUTDIR) $<
 
-
 ### REGLES OPTIONNELLES ###
 
-run : $(OFILES)
-	${JVM} ${JVMFLAGS} -cp $(OUTDIR) Main $(RUN_ARGS)
+GridMaker : $(OFILES)
+	${JVM} ${JVMFLAGS} -cp $(OUTDIR) GridMaker $(RUN_ARGS)
+
+GridSolver : $(OFILES)
+	${JVM} ${JVMFLAGS} -cp $(OUTDIR) GridSolver $(RUN_ARGS)
 
 clean :
 	-rm -rf $(OUTDIR)