Moves the templates to accommodate the tests.

1 files changed, 8 insertions, 18 deletions

diff --git a/sol-pretty-printer/Makefile b/sol-pretty-printer/Makefile
index 9dd1ee9..5390e28 100644
--- a/sol-pretty-printer/Makefile
+++ b/sol-pretty-printer/Makefile
@@ -1,29 +1,19 @@
 ## Parameters ##################################################################
 #### Where to find the solutions.
-ifndef SOL_DIR
-SOL_DIR =
-endif
+SOL_DIR ?=
 
 #### Where to find the model's data
-ifndef MODEL_DIR
-MODEL_DIR =
-endif
+MODEL_DIR ?=
 
 #### Where to find the properties' pretty-print files
-ifndef PROPERTY_FILES
-PROPERTY_FILES =
-endif
+TEMPLATE_DIR ?=
 
 #### Binaries
 ###### JRE binary
-ifndef JAVA
-JAVA = java
-endif
+JAVA ?= java
 
 ###### JDK binary
-ifndef JAVAC
-JAVAC = javac
-endif
+JAVAC ?= javac
 
 ## Parameters Sanity Check #####################################################
 ifeq ($(strip $(SOL_DIR)),)
@@ -34,8 +24,8 @@ ifeq ($(strip $(MODEL_DIR)),)
 $(error No MODEL_DIR defined as parameter.)
 endif
 
-ifeq ($(strip $(PROPERTY_FILES)),)
-$(error No PROPERTY_FILES defined as parameter.)
+ifeq ($(strip $(TEMPLATE_DIR)),)
+$(error No TEMPLATE_DIR defined as parameter.)
 endif
 
 ifeq ($(strip $(JAVA)),)
@@ -54,7 +44,7 @@ SOURCES = $(wildcard src/*.java)
 CLASSES = $(SOURCES:.java=.class)
 
 SOLUTION_FILES = $(wildcard $(SOL_DIR)/*.sol)
-PROPERTY_PP_FILES = $(PROPERTY_FILES:.pro=.pp)
+PROPERTY_PP_FILES = $(wildcard $(TEMPLATE_DIR)/*.pp)
 SOLUTION_PP_PAIRS = \
 	$(foreach sf,$(SOLUTION_FILES),$(sf) $(filter %$(basename $(notdir $(sf))).pp,$(PROPERTY_PP_FILES)))