From 6ea470d7d8af2bce04b4d24ec107ec038df5bea1 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 24 Apr 2009 19:31:57 +0000 Subject: [PATCH] Deleted remaining references to sun4 (mostly in comments). --- configure/CONFIG_ADDONS | 9 ++++----- configure/CONFIG_COMMON | 4 ++-- configure/os/CONFIG.linux-x86-borland.linux-x86-borland | 4 ---- configure/os/CONFIG.win32-x86-borland.win32-x86-borland | 4 ---- configure/os/CONFIG.win32-x86.win32-x86 | 4 ---- configure/os/CONFIG_COMPAT | 1 - 6 files changed, 6 insertions(+), 20 deletions(-) diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index 70bc89895..e552c91ed 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -3,11 +3,10 @@ # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# $Id# +# $Id$ # # check for add-on CFLAGS and CXXFLAGS # @@ -20,8 +19,8 @@ # 4) if you have the special case that your USR_CFLAGS_$(OS_CLASS) is # empty but you don't want 3), you have to define it as '-nil-', e.g.: # USR_CFLAGS = -# USR_CFLAGS_sun4 = -nil- -# USR_CFLAGS_DEFAULT = +# USR_CFLAGS_WIN = -nil- +# USR_CFLAGS_DEFAULT = # # These rules apply to these Makefile-variables: # USR_CFLAGS C flags diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index cafec0e60..5940b2b6d 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -175,14 +175,14 @@ LIB_BAF=$(addsuffix $(BAF),$(basename $(LIBRARY))) #-------------------------------------------------- # C preprocessor, compiler, and linker flag defaults -# Target architecture specific (solaris,sun4,mv167,...) flags +# Target architecture specific flags ARCH_DEP_CPPFLAGS = ARCH_DEP_CFLAGS = ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS) ARCH_DEP_LDFLAGS = ARCH_DEP_LDLIBS = -# Target operating system specific (Unix,Vx,WIN32...) flags +# Target operating system specific flags OP_SYS_CPPFLAGS = OP_SYS_CFLAGS = OP_SYS_CXXFLAGS = $(OP_SYS_CFLAGS) diff --git a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland index 0e95da351..e4c20303e 100644 --- a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland +++ b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland @@ -111,10 +111,6 @@ OPT_LDFLAGS = ARCH_DEP_CFLAGS= -# to identify the general architecture class: -# should be BSD, SYSV, WIN32, ... -# is: WIN32, sun4, hpux, linux, ... -# OS_CLASS=Linux diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland index f5bf7b965..841f3a52f 100644 --- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland +++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland @@ -128,10 +128,6 @@ OPT_LDFLAGS = SHRLIB_CFLAGS= ARCH_DEP_CFLAGS= -# to identify the general architecture class: -# should be BSD, SYSV, WIN32, ... -# is: WIN32, sun4, hpux, linux, ... -# OS_CLASS=WIN32 POSIX=NO diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 24f0c5cda..d56bd6235 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -151,10 +151,6 @@ OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) ARCH_DEP_CFLAGS= SHRLIB_CFLAGS= -# to identify the general architecture class: -# should be BSD, SYSV, WIN32, ... -# is: WIN32, sun4, hpux, linux, ... -# OS_CLASS=WIN32 POSIX=NO diff --git a/configure/os/CONFIG_COMPAT b/configure/os/CONFIG_COMPAT index c72049b61..cddf41bf7 100644 --- a/configure/os/CONFIG_COMPAT +++ b/configure/os/CONFIG_COMPAT @@ -10,7 +10,6 @@ # ARCH_ = ARCH_solaris = solaris-sparc ARCH_solarisGnu = solaris-sparc-gnu -ARCH_sun4 = sun4-sparc ARCH_Linux = linux-x86 ARCH_Darwin = darwin-ppc ARCH_WIN32 = win32-x86