summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-07-24 09:51:20 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-07-24 09:51:20 +0200
commitc734cd67ee4ebe5c235c7785f6b193952bf3bc17 (patch)
treee190587e1b7e52157f5381a311f732071fb488bd /cfg-to-paths
parent2b3f20d89c7d500842869d3316bee9c7457ba6d4 (diff)
Fixes connect_to/node_connect, configs Makefiles.
Diffstat (limited to 'cfg-to-paths')
-rw-r--r--cfg-to-paths/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/cfg-to-paths/Makefile b/cfg-to-paths/Makefile
index f0207ae..46ba3de 100644
--- a/cfg-to-paths/Makefile
+++ b/cfg-to-paths/Makefile
@@ -1,6 +1,6 @@
## Target(s) Configuration #####################################################
-MODEL_FILES = $(wildcard ../instr-scripts/pfp_*.mod)
-OUTPUT_FILES = $(patsubst ../instr-scripts/%.mod,%.cfg.mod,$(MODEL_FILES))
+MODEL_FILES = $(wildcard ../ast-to-instr/cfg_*.mod)
+OUTPUT_FILES = $(patsubst ../ast-to-inst/%.mod,%.cfg.mod,$(MODEL_FILES))
## Executables #################################################################
JAVAC = javac
@@ -19,6 +19,7 @@ all: $(CLASSES) $(OUTPUT_FILES)
clean:
rm -f $(CLASSES)
+ rm -f *.mod
#run: $(CLASSES)
# $(JAVA) -cp $(CLASSPATH) Main $(MODEL_FILE) $(ROOT_NODE) $(ID_PREFIX) \
@@ -27,6 +28,6 @@ clean:
%.class: %.java
$(JAVAC) -cp $(CLASSPATH) $<
-%.cfg.mod: ../instr-scripts/%.mod $(CLASSES)
- $(eval ROOT_NODE := $(shell head -n 1 $< | grep "[0-9]\+" -o))
+%.cfg.mod: ../ast-to-instr/%.mod $(CLASSES)
+ $(eval ROOT_NODE := $(shell head -n 2 $< | tail -n 1 | grep "[0-9]\+" -o))
$(JAVA) -cp $(CLASSPATH) Main $< $(ROOT_NODE) "p$(ROOT_NODE)_" $@