From beb5b779c88823bf5d33b9ceca4401f64a587016 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 17 May 2019 23:56:36 +0100 Subject: [PATCH] Makefile tweak: simplify (and move) the definition of the location of CUDD. --- prism/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/prism/Makefile b/prism/Makefile index cee231aa..151fee7e 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -21,6 +21,10 @@ export PRISM_INCLUDE_DIR = include export PRISM_IMAGES_DIR = images export PRISM_DTDS_DIR = dtds +# Location of CUDD (used to be variable; now mainly fixed with the git repo layout) + +CUDD_DIR = ../cudd + #################### # Operating system # #################### @@ -297,16 +301,6 @@ endif export CFLAGS CXXFLAGS LDFLAGS JFLAGS LIBPREFIX LIBSUFFIX - -####################### -# Directory detection # -####################### - -# For CUDD, we default either to ./cudd or, if that does not exist, ../cudd -# To override, comment out the first line and use the second (or specify from the command-line) -CUDD_DIR = $(shell if [ -d cudd ]; then echo cudd; else echo ../cudd; fi ) -#CUDD_DIR = cudd - ########################################## # Main part of Makefile: Compiling PRISM # ##########################################