diff options
Diffstat (limited to 'lib/make')
| -rw-r--r-- | lib/make/known-architectures/linux | 8 | ||||
| -rw-r--r-- | lib/make/make.thornlib | 6 |
2 files changed, 2 insertions, 12 deletions
diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux index f79f9662..29a36188 100644 --- a/lib/make/known-architectures/linux +++ b/lib/make/known-architectures/linux @@ -9,12 +9,6 @@ # @version $Header$ # @@*/ -if test -e "/usr/bin/aprun" ; then - echo "This is probably a Cray XT4 series system." - echo "Using known-architectures xt4-cray-linux" - . $srcdir/known-architectures/xt4-cray-linux -else - if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then @@ -611,5 +605,3 @@ else # This is caught by lib/make/extras/MPI/NATIVE then. fi - -fi diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index 2a174598..f6f640ee 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -22,17 +22,15 @@ endif # Include the main make definitions for this configuration include $(CONFIG)/make.config.defn - + BINDINGS_DIR=$(TOP)/bindings # Include the configuration make.THORN_NAME.defn for the thorn -# if it is not Cactus or CactusBindings +# if it is not CactusBindings INC_DIRS = ifneq ($(THORN), CactusBindings) -ifneq ($(THORN), Cactus) -include $(BINDINGS_DIR)/Configuration/Thorns/make.$(THORN).defn endif -endif # Add appropriate include lines INC_DIRS += $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(BINDINGS_DIR)/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements $(BINDINGS_DIR)/Configuration/Thorns $(BINDINGS_DIR)/include/$(THORN) |