From 914e0dc50230a76f75ce3b9a7f4585b1e08316d2 Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Mon, 25 Sep 2017 15:39:41 +0200 Subject: Fixes dependency rule issues. --- instr-to-kodkod/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'instr-to-kodkod/Makefile') 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 "$^" -- cgit v1.2.3-70-g09d2