From 10e7fc528c0a767da2f7b8447b6c62d017adaf54 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Wed, 16 Aug 2017 11:17:59 +0200
Subject: Fixes Makefiles so they can run parallel jobs.

---
 instr-to-kodkod/Makefile | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'instr-to-kodkod/Makefile')

diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile
index dcdada8..03e451a 100644
--- a/instr-to-kodkod/Makefile
+++ b/instr-to-kodkod/Makefile
@@ -101,16 +101,12 @@ PARSER_CLASSES = $(PARSER_SOURCES:.g4=.class)
 
 export
 ## Makefile Rules ##############################################################
-run: cfg-generator $(PARSER_CLASSES) $(CLASSES) $(SOLUTION_FILES)
+compile: $(PARSER_CLASSES) $(CLASSES)
+	$(MAKE) -C cfg-to-paths compile
 
-build: $(PARSER_CLASSES) $(CLASSES)
-	$(MAKE) -C cfg-to-paths build
+model: cfg-generator
 
-cfg-generator:
-	$(MAKE) -C cfg-to-paths
-
-$(PARSER_CLASSES): antlr-4.7-complete.jar kodkod.jar $(PARSER_SOURCES)
-	$(MAKE) -C parser
+solutions: cfg-generator $(PARSER_CLASSES) $(CLASSES) $(SOLUTION_FILES)
 
 clean:
 	$(MAKE) -C parser clean
@@ -118,6 +114,19 @@ clean:
 	rm -f $(CLASSES)
 	rm -f $(SOL_DIR)/*.sol
 
+clean_model:
+	$(MAKE) -C cfg-to-paths clean_model
+
+clean_solutions:
+	rm -f $(SOL_DIR)/*.sol
+
+########
+cfg-generator:
+	$(MAKE) -C cfg-to-paths model
+
+$(PARSER_CLASSES): antlr-4.7-complete.jar kodkod.jar $(PARSER_SOURCES)
+	$(MAKE) -C parser
+
 $(SOL_DIR)/%.sol: $(PROPERTY_FILES) $(MODEL_FILES) $(LEVEL_FILES)
 	touch $@
 	$(JAVA) -cp $(CLASSPATH) Main $@ \
-- 
cgit v1.2.3-70-g09d2