| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-25 15:39:41 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-09-25 15:39:41 +0200 |
| commit | 914e0dc50230a76f75ce3b9a7f4585b1e08316d2 (patch) | |
| tree | 2c6623f8aad3874b1b0a8701061d8e19cbf34970 | |
| parent | 4669bdf7046c03200a28de4188075bee69571eb8 (diff) | |
Fixes dependency rule issues.
| -rw-r--r-- | data/test/Makefile | 4 | ||||
| -rw-r--r-- | instr-to-kodkod/Makefile | 3 | ||||
| -rw-r--r-- | prop_to_pred/Makefile | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/data/test/Makefile b/data/test/Makefile index 07f6a88..dc9af09 100644 --- a/data/test/Makefile +++ b/data/test/Makefile @@ -2,13 +2,11 @@ TABELLION_MAIN ?= ${CURDIR}/../../ AST_CREATOR = ghdl --file-to-xml #TEST_DIRS ?= $(addprefix ${CURDIR}/,$(wildcard */)) TEST_DIRS ?= $(patsubst %/,%,$(wildcard */)) -PROPERTIES_DIR ?= ${CURDIR}/../property +PROPERTIES_DIR ?= ${CURDIR}/../property/ # TODO: Start using those variables... -SOLUTION_DIR ?= /tmp/tabellion/sol/ ORACLE_CREATOR_SCRIPT = ${CURDIR}/oracle_creator.py ################################################################################ TEST_FILES = $(addsuffix /valid,$(TEST_DIRS)) $(addsuffix /invalid,$(TEST_DIRS)) -SOLUTION_FILES = $(addsuffix .sol,$(addprefix $(SOLUTION_DIR)/,$(TEST_DIRS))) #VHD_FILES = $(addsuffix .vhd, $(TEST_FILES)) AST_FILES = $(addsuffix .xml, $(TEST_FILES)) diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile index cac9ffe..ea1d82c 100644 --- a/instr-to-kodkod/Makefile +++ b/instr-to-kodkod/Makefile @@ -82,6 +82,7 @@ ANTLR_JAR = ${CURDIR}/antlr-4.7-complete.jar SOURCES = $(wildcard src/*.java) CLASSES = $(SOURCES:.java=.class) SOLUTION_FILES = $(addsuffix .sol,$(addprefix $(SOL_DIR)/,$(notdir $(PROPERTIES)))) +ALL_SOLUTION_FILES = $(addsuffix .sol,$(addprefix $(SOL_DIR)/,$(notdir $(basename $(ALL_PROPERTY_FILES))))) DEPENDENCY_FILES = \ $(addprefix $(DEPENDENCIES_DIR)/,$(notdir $(ALL_PROPERTY_FILES:.pro=.deps))) MODEL_FILES = \ @@ -130,7 +131,7 @@ $(PARSER_CLASSES): antlr-4.7-complete.jar kodkod.jar $(PARSER_SOURCES) -include $(wildcard $(DEPENDENCIES_DIR)/*) -$(SOLUTION_FILES): $(SOL_DIR)/%.sol: $(PROPERTIES_DIR)/%.pro \ +$(ALL_SOLUTION_FILES): $(SOL_DIR)/%.sol: $(PROPERTIES_DIR)/%.pro \ $(SOL_DIR)/%.sol.ready $(MODEL_FILES) $(LEVEL_FILES) # $(addprefix $(SOL_DIR)/,$(addsuffix .sol,$($(DEPENDENCIES_DIR)/%.deps))) echo "$^" diff --git a/prop_to_pred/Makefile b/prop_to_pred/Makefile index 50cd36a..0fe37cc 100644 --- a/prop_to_pred/Makefile +++ b/prop_to_pred/Makefile @@ -2,6 +2,9 @@ TO_PRED_TEMPLATE_DIR ?= INFERRED_LEVEL_FILE ?= PARSING_SCRIPT ?= ${CURDIR}/parser.py +PROPERTIES_DIR ?= +#### Where to find the properties to verify +ALL_PROPERTY_FILES ?= $(wildcard $(PROPERTIES_DIR)/*.pro) ## Parameters Sanity Check ##################################################### ifeq ($(strip $(PARSING_SCRIPT)),) @@ -12,9 +15,9 @@ endif ## Makefile Magic ############################################################## PRED_TO_INFER = \ - $(addprefix $(TO_PRED_TEMPLATE_DIR)/,$(notdir $(wildcard $(TEMPLATE_DIR)/*.pp))) + $(addsuffix .pp,$(addprefix $(TO_PRED_TEMPLATE_DIR)/,$(notdir $(basename $(ALL_PROPERTY_FILES))))) ADDITIONAL_MAKEFILES = \ - $(addsuffix .deps,$(addprefix $(DEPENDENCIES_DIR)/,$(basename $(notdir $(wildcard $(PROPERTIES_DIR)/*.pro))))) + $(addsuffix .deps,$(addprefix $(DEPENDENCIES_DIR)/,$(basename $(notdir $(ALL_PROPERTY_FILES))))) export ## Makefile Rules ############################################################## |