diff --git a/Makefile b/Makefile index 899de4dd4..5ab39416a 100644 --- a/Makefile +++ b/Makefile @@ -11,19 +11,12 @@ # TOP = ../.. -# If a /configure directory exists, build with 3.14 rules, else -# use /config and the 3.13 rules. -ifeq (0, $(words $(notdir $(wildcard $(TOP)/configure)))) - include $(TOP)/config/CONFIG_EXTENSIONS - include $(TOP)/config/RULES_ARCHS -else - include $(TOP)/configure/CONFIG +include $(TOP)/configure/CONFIG - PROD_HOST = msi - HTMLS = msi.html +PROD_HOST = msi +HTMLS = msi.html - msi_SRCS = msi.c - PROD_LIBS += Com +msi_SRCS = msi.c +PROD_LIBS += Com - include $(TOP)/configure/RULES -endif +include $(TOP)/configure/RULES diff --git a/Makefile.Host b/Makefile.Host deleted file mode 100644 index 1e5493b63..000000000 --- a/Makefile.Host +++ /dev/null @@ -1,21 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# This file is distributed subject to a Software License Agreement found -# in the file LICENSE that is included with this distribution. -#************************************************************************* -TOP = ../../.. -include $(TOP)/config/CONFIG_EXTENSIONS - - -PROD_LIBS += Com - -HTMLS += msi.html - -SRCS.c= ../msi.c -PROD = msi - -include $(TOP)/config/RULES.Host -