aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--interface.ccl1
-rw-r--r--src/make.configuration.defn18
2 files changed, 8 insertions, 11 deletions
diff --git a/interface.ccl b/interface.ccl
index edf0c69..b552ebd 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -1,4 +1,3 @@
# Interface definition for thorn IOFlexIO
implements: IOFlexIO
-inherits: IEEEIO
diff --git a/src/make.configuration.defn b/src/make.configuration.defn
index 55fefa5..67f7cd5 100644
--- a/src/make.configuration.defn
+++ b/src/make.configuration.defn
@@ -2,20 +2,18 @@
# make sure that IOFlexIO was configured with IEEEIO and PUGH
-ifneq ($(strip $(HAVE_IEEEIO)),yes)
-$(NAME): MissingIEEEIO
-.pseudo: MissingIEEEIO
-MissingIEEEIO:
+ifeq ($(findstring external/IEEEIO,$(THORNS)),)
+.pseudo: MissingIEEEIOinFlexIO
+MissingIEEEIOinFlexIO:
@echo "IOFlexIO: requires IEEEIO"
- @echo "IOFlexIO: Please configure Cactus with thorn external/IEEEIO or remove IOFlexIO from Thornlist !"
+ @echo "IOFlexIO: Please add external/IEEEIO or remove IOFlexIO from Thornlist !"
exit 2
endif
-ifneq ($(strip $(HAVE_PUGH)),yes)
-$(NAME): MissingPUGH
-.pseudo: MissingPUGH
-MissingPUGH:
+ifeq ($(findstring CactusPUGH/PUGH,$(THORNS)),)
+.pseudo: MissingPUGHinIOFlexIO
+MissingPUGHinIOFlexIO:
@echo "IOFlexIO: requires PUGH"
- @echo "IOFlexIO: Please configure Cactus with thorn CactusPUGH/PUGH or remove IOFlexIO from Thornlist !"
+ @echo "IOFlexIO: Please add CactusPUGH/PUGH or remove IOFlexIO from Thornlist !"
exit 2
endif