From c734cd67ee4ebe5c235c7785f6b193952bf3bc17 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Mon, 24 Jul 2017 09:51:20 +0200
Subject: Fixes connect_to/node_connect, configs Makefiles.

---
 instr-to-kodkod/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile
index 7aa82ce..efcfaa5 100644
--- a/instr-to-kodkod/Makefile
+++ b/instr-to-kodkod/Makefile
@@ -1,6 +1,6 @@
 ## Target(s) Configuration #####################################################
 #MODEL_FILES = $(wildcard ../data/instructions/*.mod)
-MODEL_FILES = ../instr-scripts/structural.mod $(wildcard ../instr-scripts/pfp_*.mod) $(wildcard ../cfg-to-paths/pfp_*.mod)
+MODEL_FILES = ../ast-to-instr/structural.mod $(wildcard ../ast-to-instr/cfg_*.mod) $(wildcard ../cfg-to-paths/*.mod)
 LEVEL_DIR = $(wildcard ../data/level/*.lvl)
 #PROPERTY_FILE = ../data/property/unread_waveforms.pro
 #PROPERTY_FILE = ../data/property/impossible_processes.pro
@@ -28,12 +28,18 @@ CLASSES = $(SOURCES:.java=.class)
 ## Makefile Rules ##############################################################
 
 all: parser/PropertyParser.java $(CLASSES)
+	$(MAKE) -C ../ast-to-instr
+	$(MAKE) -C ../cfg-to-paths
 
 clean:
 	rm -f $(CLASSES)
 	$(MAKE) -C parser clean
+	$(MAKE) -C ../ast-to-instr clean
+	$(MAKE) -C ../cfg-to-paths clean
 
 run: parser/PropertyParser.java $(CLASSES) $(REQUIRED_JARS)
+	$(MAKE) -C ../ast-to-instr
+	$(MAKE) -C ../cfg-to-paths
 	$(JAVA) -cp $(CLASSPATH) Main $(VAR_PREFIX) $(INPUT_FILES)
 
 %.class: %.java $(REQUIRED_JARS)
-- 
cgit v1.2.3-70-g09d2