3 files changed, 7 insertions, 1 deletions
diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile
index 1fe4535..dcdada8 100644
--- a/instr-to-kodkod/Makefile
+++ b/instr-to-kodkod/Makefile
@@ -94,6 +94,7 @@ SOLUTION_FILES = $(addprefix $(SOL_DIR)/,$(notdir $(PROPERTY_FILES:.pro=.sol)))
 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))
 PARSER_SOURCES = $(wildcard parser/*.g4)
 PARSER_CLASSES = $(PARSER_SOURCES:.g4=.class)
@@ -102,6 +103,9 @@ export
 ## Makefile Rules ##############################################################
 run: cfg-generator $(PARSER_CLASSES) $(CLASSES) $(SOLUTION_FILES)
 
+build: $(PARSER_CLASSES) $(CLASSES)
+	$(MAKE) -C cfg-to-paths build
+
 cfg-generator:
 	$(MAKE) -C cfg-to-paths
 
diff --git a/instr-to-kodkod/cfg-to-paths/Makefile b/instr-to-kodkod/cfg-to-paths/Makefile
index 3fa5e5c..7971c84 100644
--- a/instr-to-kodkod/cfg-to-paths/Makefile
+++ b/instr-to-kodkod/cfg-to-paths/Makefile
@@ -51,6 +51,8 @@ PATH_MODEL_FILES = $(addprefix $(PATH_MODEL_DIR)/,$(notdir $(CFG_MODEL_FILES)))
 ## Makefile Rules ##############################################################
 all: $(PATH_MODEL_DIR) $(PATH_MODEL_FILES) $(CLASSES)
 
+build: $(CLASSES)
+
 %.class: %.java
 	$(JAVAC) -cp $(CLASSPATH) $<
 
diff --git a/instr-to-kodkod/parser/Makefile b/instr-to-kodkod/parser/Makefile
index 435a687..d26baf4 100644
--- a/instr-to-kodkod/parser/Makefile
+++ b/instr-to-kodkod/parser/Makefile
@@ -51,7 +51,7 @@ JAVA_SOURCES = $(ANTLR_SOURCES:.g4=.java)
 CLASSES = $(JAVA_SOURCES:.java=.class)
 CLASSPATH = ".:$(MAIN_PROGRAM_SRC):$(KODKOD_JAR):$(ANTLR_JAR)"
 
-compile: $(CLASSES)
+build: $(CLASSES)
 
 PropertyParser.java: PropertyLexer.g4  PropertyParser.g4