| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-18 10:46:34 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-18 10:46:34 +0200 |
| commit | 2e15b9f8a8be3bea2b0ed1cb633c2f35582e39b8 (patch) | |
| tree | 88587ce79357e1791075fdf3e8afb820225df864 /instr-to-kodkod/Makefile | |
| parent | 079af0e3eacb62e9e0cecedef7e0c7ddffe74275 (diff) | |
| parent | 77838a1342b53ca97d842ef47ff91f44f6a5bbeb (diff) | |
Merge branch 'master' of dreamhost:~/repositories/git/tabellion
Diffstat (limited to 'instr-to-kodkod/Makefile')
| -rw-r--r-- | instr-to-kodkod/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile index 03e451a..08af039 100644 --- a/instr-to-kodkod/Makefile +++ b/instr-to-kodkod/Makefile @@ -95,7 +95,8 @@ MODEL_FILES = \ $(MODEL_DIR)/structural.mod \ $(MODEL_DIR)/depths.mod \ $(MODEL_DIR)/string_to_instr.map \ - $(filter-out %structural.mod,$(wildcard $(MODEL_DIR)/cfg_*.mod)) + $(wildcard $(MODEL_DIR)/cfg_*.mod) \ + $(wildcard $(MODEL_INSTANCES_DIR)/*.mod) PARSER_SOURCES = $(wildcard parser/*.g4) PARSER_CLASSES = $(PARSER_SOURCES:.g4=.class) @@ -106,7 +107,8 @@ compile: $(PARSER_CLASSES) $(CLASSES) model: cfg-generator -solutions: cfg-generator $(PARSER_CLASSES) $(CLASSES) $(SOLUTION_FILES) +solutions: cfg-generator $(REQUIRED_JARS) $(PARSER_CLASSES) $(CLASSES) \ + $(SOLUTION_FILES) clean: $(MAKE) -C parser clean |