From ea11fdc81ed7a8df14868476c04bf2fe7c7b6393 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Tue, 29 Aug 2017 16:51:09 +0200
Subject: Most of the program's logic seems to be there...

---
 instance-calculator/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'instance-calculator/Makefile')

diff --git a/instance-calculator/Makefile b/instance-calculator/Makefile
index 8da7891..356b681 100644
--- a/instance-calculator/Makefile
+++ b/instance-calculator/Makefile
@@ -6,7 +6,7 @@ endif
 
 #### Where to store the Instance model
 ifndef INSTANCE_MODEL_DIR
-INSTANCE_MODEL_DIR =
+INSTANCE_MODEL_DIR = $(MODEL_DIR)/instance/
 endif
 
 #### Binaries
@@ -43,7 +43,7 @@ CLASSPATH = "./src/"
 ## Makefile Magic ##############################################################
 SOURCES = $(wildcard src/*.java)
 CLASSES = $(SOURCES:.java=.class)
-MODEL_FILES = $(MODEL_DIR)/structural.mod
+MODEL_FILE = $(MODEL_DIR)/structural.mod
 OUTPUT_FILE = $(INSTANCE_MODEL_DIR)/instances.mod
 
 ## Makefile Rules ##############################################################
@@ -51,18 +51,23 @@ compile: $(CLASSES)
 
 model: $(CLASSES) $(INSTANCE_MODEL_DIR) $(OUTPUT_FILE)
 
+solutions:
+
 clean:
 	rm -f $(CLASSES)
 	rm -f $(PATH_MODEL_DIR)/*.mod
 
 clean_model:
 	rm -f $(PATH_MODEL_DIR)/*.mod
+
+clean_solutions:
+
 ########
 %.class: %.java
 	$(JAVAC) -cp $(CLASSPATH) $<
 
 $(OUTPUT_FILE): $(MODEL_FILE) $(CLASSES)
-	$(JAVA) -cp $(CLASSPATH) Main $< $@
+	$(JAVA) -cp $(CLASSPATH) Main $(MODEL_FILE) "inst_" $@
 
 $(INSTANCE_MODEL_DIR):
 	mkdir -p $(INSTANCE_MODEL_DIR)
-- 
cgit v1.2.3-70-g09d2