summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-09-18 10:46:34 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-09-18 10:46:34 +0200
commit2e15b9f8a8be3bea2b0ed1cb633c2f35582e39b8 (patch)
tree88587ce79357e1791075fdf3e8afb820225df864 /Makefile
parent079af0e3eacb62e9e0cecedef7e0c7ddffe74275 (diff)
parent77838a1342b53ca97d842ef47ff91f44f6a5bbeb (diff)
Merge branch 'master' of dreamhost:~/repositories/git/tabellion
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 19a69d8..a959838 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,12 @@ AST_FILE = ${CURDIR}/data/ast/best_chronometer_ever.xml
TMP_DIR = /tmp/tabellion
MODEL_DIR = $(TMP_DIR)/mod
+MODEL_INSTANCES_DIR = $(MODEL_DIR)/instance
SOL_DIR = $(TMP_DIR)/sol
## Sub-programs ################################################################
AST_TO_INSTR = ast-to-instr
+INST_CALC = instance-calculator
SOLVER = instr-to-kodkod
PRETTY_PRINTER = sol-pretty-printer
@@ -24,31 +26,37 @@ all: $(TMP_DIR) $(MODEL_DIR) $(SOL_DIR)
compile:
$(MAKE) -C $(AST_TO_INSTR) compile
+ $(MAKE) -C $(INST_CALC) compile
$(MAKE) -C $(SOLVER) compile
$(MAKE) -C $(PRETTY_PRINTER) compile
model:
$(MAKE) -C $(AST_TO_INSTR) model
+ $(MAKE) -C $(INST_CALC) model
$(MAKE) -C $(SOLVER) model
$(MAKE) -C $(PRETTY_PRINTER) model
solutions: $(TMP_DIR) $(MODEL_DIR) $(SOL_DIR)
$(MAKE) -C $(AST_TO_INSTR) solutions
+ $(MAKE) -C $(INST_CALC) solutions
$(MAKE) -C $(SOLVER) solutions
$(MAKE) -C $(PRETTY_PRINTER) solutions
clean:
$(MAKE) -C $(AST_TO_INSTR) clean
+ $(MAKE) -C $(INST_CALC) clean
$(MAKE) -C $(SOLVER) clean
$(MAKE) -C $(PRETTY_PRINTER) clean
clean_model:
$(MAKE) -C $(AST_TO_INSTR) clean_model
+ $(MAKE) -C $(INST_CALC) clean_model
$(MAKE) -C $(SOLVER) clean_model
$(MAKE) -C $(PRETTY_PRINTER) clean_model
clean_solutions:
$(MAKE) -C $(AST_TO_INSTR) clean_solutions
+ $(MAKE) -C $(INST_CALC) clean_solutions
$(MAKE) -C $(SOLVER) clean_solutions
$(MAKE) -C $(PRETTY_PRINTER) clean_solutions