| summaryrefslogtreecommitdiff |
path: root/instr-to-kodkod
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-07-24 09:51:20 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-07-24 09:51:20 +0200 |
| commit | c734cd67ee4ebe5c235c7785f6b193952bf3bc17 (patch) | |
| tree | e190587e1b7e52157f5381a311f732071fb488bd /instr-to-kodkod | |
| parent | 2b3f20d89c7d500842869d3316bee9c7457ba6d4 (diff) | |
Fixes connect_to/node_connect, configs Makefiles.
Diffstat (limited to 'instr-to-kodkod')
| -rw-r--r-- | instr-to-kodkod/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
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) |