diff --git a/contrib/distro-tools/build_nwchem b/contrib/distro-tools/build_nwchem index f108040be0..8ef3a7cd58 100755 --- a/contrib/distro-tools/build_nwchem +++ b/contrib/distro-tools/build_nwchem @@ -1743,12 +1743,6 @@ if [ ${#NWCHEM_OS} -eq 0 ] ; then # There is no CYGNUS64 target so set NWCHEM_TARGET here export NWCHEM_TARGET=${NWCHEM_OS} fi - elif [ `expr match ${NWCHEM_OS} INTERIX` != "0" ] ; then - export NWCHEM_OS=INTERIX - if [ ${#NWCHEM_TARGET} -eq 0 ] ; then - # There is no INTERIX64 target so set NWCHEM_TARGET here - export NWCHEM_TARGET=${NWCHEM_OS} - fi fi fi fi diff --git a/contrib/distro-tools/build_nwchem_src_distro b/contrib/distro-tools/build_nwchem_src_distro index 4019e3669d..3cf866a0cd 100755 --- a/contrib/distro-tools/build_nwchem_src_distro +++ b/contrib/distro-tools/build_nwchem_src_distro @@ -54,8 +54,6 @@ if [ ${#NWCHEM_TARGET} -eq 0 ] ; then export NWCHEM_TARGET=CYGWIN elif [ `expr match ${NWCHEM_OS} CYGNUS` != "0" ] ; then export NWCHEM_TARGET=CYGNUS - elif [ `expr match ${NWCHEM_OS} INTERIX` != "0" ] ; then - export NWCHEM_TARGET=INTERIX else export NWCHEM_TARGET=LINUX64 fi diff --git a/src/config/makefile.h b/src/config/makefile.h index 07205a1b6d..8015ced1ac 100644 --- a/src/config/makefile.h +++ b/src/config/makefile.h @@ -1277,7 +1277,7 @@ endif endif -ifeq ($(TARGET),$(findstring $(TARGET),LINUX CYGNUS CYGWIN INTERIX)) +ifeq ($(TARGET),$(findstring $(TARGET),LINUX CYGNUS CYGWIN)) # # # Linux or Cygwin under Windows running on an x86 using g77 diff --git a/src/peigs/DEFS b/src/peigs/DEFS index 2befee60b4..78b94739f3 100644 --- a/src/peigs/DEFS +++ b/src/peigs/DEFS @@ -614,7 +614,7 @@ peigs_FC += -DSTD_DBL -D$(peigs_COMM) -Ovector2 endif endif -ifeq ($(peigs_TARGET),$(findstring $(peigs_TARGET),LINUX INTERIX CYGWIN CYGNUS)) +ifeq ($(peigs_TARGET),$(findstring $(peigs_TARGET),LINUX CYGWIN CYGNUS)) # # Linux running on an x86 using f77 on f2c # diff --git a/src/peigs/comm/GNUmakefile b/src/peigs/comm/GNUmakefile index 7a4d854442..eb2b71e05e 100644 --- a/src/peigs/comm/GNUmakefile +++ b/src/peigs/comm/GNUmakefile @@ -3,7 +3,7 @@ # include ../../config/makefile.h include ../DEFS -NOCASENS = CYGNUS MACX64 MACX CYGWIN CYGWIN64 INTERIX +NOCASENS = CYGNUS MACX64 MACX CYGWIN CYGWIN64 ifneq ($(peigs_TARGET),$(findstring $(peigs_TARGET), $(NOCASENS))) REMOVESF=TRUE endif diff --git a/src/peigs/src/f77/GNUmakefile b/src/peigs/src/f77/GNUmakefile index 1592b4318d..538975d5b6 100644 --- a/src/peigs/src/f77/GNUmakefile +++ b/src/peigs/src/f77/GNUmakefile @@ -4,7 +4,7 @@ include ../../../config/makefile.h include ../../DEFS -NOCASENS = CYGNUS MACX64 MACX CYGWIN CYGWIN64 INTERIX +NOCASENS = CYGNUS MACX64 MACX CYGWIN CYGWIN64 ifneq ($(peigs_TARGET),$(findstring $(peigs_TARGET), $(NOCASENS))) REMOVESF=TRUE endif diff --git a/src/selci/cputm.c b/src/selci/cputm.c index 7264193aba..5b0fe191ad 100644 --- a/src/selci/cputm.c +++ b/src/selci/cputm.c @@ -24,11 +24,7 @@ int *ai; #ifndef WIN32 /* !!! Comment out function for WIN32 just so we can keep going */ struct timeval tp; -#ifdef __INTERIX -char tzp[10]; -#else struct timezone tzp; -#endif int i; gettimeofday(&tp,&tzp); diff --git a/src/util/GNUmakefile b/src/util/GNUmakefile index 8a4891fb8b..f5b4724f93 100644 --- a/src/util/GNUmakefile +++ b/src/util/GNUmakefile @@ -104,12 +104,10 @@ ifdef NO_MPIF LIB_DEFINES += -DNO_MPIF endif -ifeq ($(TARGET),$(findstring $(TARGET),BGL BGP BGQ LINUX CYGWIN CYGWIN64 CYGNUS INTERIX LINUX64 MACX MACX64)) +ifeq ($(TARGET),$(findstring $(TARGET),BGL BGP BGQ LINUX CYGWIN CYGWIN64 CYGNUS LINUX64 MACX MACX64)) EXTRA_OBJ = linux_cpu.o linux_shift.o linux_random.o erfc.o linux_printaff.o ifeq ($(LINUXCPU),x86) - ifneq ($(TARGET),INTERIX) - EXTRA_OBJ += linux_setfpucw.o - endif + EXTRA_OBJ += linux_setfpucw.o endif LIB_DEFINES += -DBYTE_SHORT_PACKING ifeq ($(FC),ifc) @@ -253,9 +251,6 @@ ifdef SPEECH OBJ += udp.o endif -ifeq ($(TARGET),INTERIX) -DEFINES += -DNOSOCKLEN -endif ifeq ($(TARGET),LINUX) DEFINES += -DNEED_LOC endif