summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-08-29 16:51:09 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-08-29 16:51:09 +0200
commitea11fdc81ed7a8df14868476c04bf2fe7c7b6393 (patch)
treeb71364022fb3d670fb011916c9395781a5082306 /instance-calculator/Makefile
parent9a5e79dfd1c6829b052ab7cf0cb7a79afd25eb72 (diff)
Most of the program's logic seems to be there...
Diffstat (limited to 'instance-calculator/Makefile')
-rw-r--r--instance-calculator/Makefile11
1 files changed, 8 insertions, 3 deletions
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)