From 3a9fee912f5d158106d3d0309a17593a332721e7 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Wed, 19 Jul 2017 10:38:03 +0200
Subject: Fixes stupid mistakes.

---
 instr-to-kodkod/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile
index 073fe58..0f51838 100644
--- a/instr-to-kodkod/Makefile
+++ b/instr-to-kodkod/Makefile
@@ -1,6 +1,9 @@
 ## Target(s) Configuration #####################################################
-MODEL_FILE = "../data/instructions/example_1.sl"
-LEVEL_DIR = "../data/level/"
+MODEL_FILES = $(wildcard ../data/instructions/*.mod)
+LEVEL_DIR = $(wildcard ../data/level/*.lvl)
+PROPERTY_FILE = ../data/property/unread_waveforms.pro
+VAR_PREFIX = "_anon_"
+
 ## Executables #################################################################
 JAVAC = javac
 JAVA = java
@@ -14,6 +17,7 @@ JAR_SOURCE = https://noot-noot.org/onera_2017/jar/
 REQUIRED_JARS = kodkod.jar org.sat4j.core.jar antlr-4.7-complete.jar
 
 ## Makefile Magic ##############################################################
+INPUT_FILES = $(MODEL_FILES) $(LEVEL_DIR) $(PROPERTY_FILE)
 SOURCES = $(wildcard src/*.java parser/*.java)
 CLASSES = $(SOURCES:.java=.class)
 
@@ -26,7 +30,7 @@ clean:
 	$(MAKE) -C parser clean
 
 run: parser/PropertyParser.java $(CLASSES) $(REQUIRED_JARS)
-	$(JAVA) -cp $(CLASSPATH) Main $(LEVEL_DIR) $(MODEL_FILE)
+	$(JAVA) -cp $(CLASSPATH) Main $(VAR_PREFIX) $(INPUT_FILES)
 
 %.class: %.java $(REQUIRED_JARS)
 	$(JAVAC) -cp $(CLASSPATH) $<
-- 
cgit v1.2.3-70-g09d2