From 4ba33b8259c2ba2186fec44c2bf744db017d3931 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 11 Jul 1996 19:16:59 +0000 Subject: [PATCH] Major revision of config directory again. --- config/CONFIG | 15 ++---- config/{CONFIG.Unix.Linux => CONFIG.Linux} | 8 +-- config/{CONFIG.Unix.alpha => CONFIG.alpha} | 4 ++ config/{CONFIG_ARCH.hkv2f => CONFIG.hkv2f} | 13 +++-- config/{CONFIG.Unix.hp700 => CONFIG.hp700} | 4 ++ config/{CONFIG_ARCH.niCpu030 => CONFIG.mv147} | 14 +++-- config/{CONFIG_ARCH.mv167 => CONFIG.mv162} | 13 +++-- .../{CONFIG_ARCH.mv162lc => CONFIG.mv162lc} | 14 +++-- config/{CONFIG_ARCH.test167 => CONFIG.mv167} | 14 +++-- config/{CONFIG_ARCH.mv147 => CONFIG.niCpu030} | 6 +-- config/{CONFIG.Unix.sgi => CONFIG.sgi} | 7 +-- .../{CONFIG.Unix.solaris => CONFIG.solaris} | 12 +++-- config/{CONFIG.Unix.sun4 => CONFIG.sun4} | 7 +-- config/CONFIG_ARCH.Linux | 19 ------- config/CONFIG_ARCH.alpha | 18 ------- config/CONFIG_ARCH.hp700 | 18 ------- config/CONFIG_ARCH.mv162 | 18 ------- config/CONFIG_ARCH.sgi | 17 ------ config/CONFIG_ARCH.solaris | 23 -------- config/CONFIG_ARCH.sun4 | 17 ------ config/CONFIG_COMMON | 1 + config/CONFIG_SITE | 3 +- config/CONFIG_SITE.Linux | 13 +++++ config/CONFIG_SITE.Unix.Linux | 37 ------------- config/CONFIG_SITE.Unix.hp700 | 30 ----------- config/CONFIG_SITE.Unix.sgi | 40 -------------- config/CONFIG_SITE.Unix.solaris | 52 ------------------- config/CONFIG_SITE.Unix.sun4 | 37 ------------- ...NFIG_SITE.Unix.alpha => CONFIG_SITE.alpha} | 17 ------ .../{CONFIG_SITE.Vx.68k => CONFIG_SITE.hkv2f} | 0 config/CONFIG_SITE.hp700 | 14 +++++ config/{CONFIG.Vx.Linux => CONFIG_SITE.mv147} | 1 + ...CONFIG_SITE.Vx.Linux => CONFIG_SITE.mv162} | 1 + config/CONFIG_SITE.mv162lc | 9 ++++ config/CONFIG_SITE.mv167 | 9 ++++ config/CONFIG_SITE.niCpu030 | 9 ++++ config/CONFIG_SITE.sgi | 21 ++++++++ config/CONFIG_SITE.solaris | 20 +++++++ config/CONFIG_SITE.sun4 | 23 ++++++++ 39 files changed, 187 insertions(+), 411 deletions(-) rename config/{CONFIG.Unix.Linux => CONFIG.Linux} (97%) rename config/{CONFIG.Unix.alpha => CONFIG.alpha} (97%) rename config/{CONFIG_ARCH.hkv2f => CONFIG.hkv2f} (64%) rename config/{CONFIG.Unix.hp700 => CONFIG.hp700} (97%) rename config/{CONFIG_ARCH.niCpu030 => CONFIG.mv147} (61%) rename config/{CONFIG_ARCH.mv167 => CONFIG.mv162} (64%) rename config/{CONFIG_ARCH.mv162lc => CONFIG.mv162lc} (65%) rename config/{CONFIG_ARCH.test167 => CONFIG.mv167} (61%) rename config/{CONFIG_ARCH.mv147 => CONFIG.niCpu030} (75%) rename config/{CONFIG.Unix.sgi => CONFIG.sgi} (97%) rename config/{CONFIG.Unix.solaris => CONFIG.solaris} (93%) rename config/{CONFIG.Unix.sun4 => CONFIG.sun4} (98%) delete mode 100644 config/CONFIG_ARCH.Linux delete mode 100644 config/CONFIG_ARCH.alpha delete mode 100644 config/CONFIG_ARCH.hp700 delete mode 100644 config/CONFIG_ARCH.mv162 delete mode 100644 config/CONFIG_ARCH.sgi delete mode 100644 config/CONFIG_ARCH.solaris delete mode 100644 config/CONFIG_ARCH.sun4 create mode 100644 config/CONFIG_SITE.Linux delete mode 100644 config/CONFIG_SITE.Unix.Linux delete mode 100644 config/CONFIG_SITE.Unix.hp700 delete mode 100644 config/CONFIG_SITE.Unix.sgi delete mode 100644 config/CONFIG_SITE.Unix.solaris delete mode 100644 config/CONFIG_SITE.Unix.sun4 rename config/{CONFIG_SITE.Unix.alpha => CONFIG_SITE.alpha} (52%) rename config/{CONFIG_SITE.Vx.68k => CONFIG_SITE.hkv2f} (100%) create mode 100644 config/CONFIG_SITE.hp700 rename config/{CONFIG.Vx.Linux => CONFIG_SITE.mv147} (99%) rename config/{CONFIG_SITE.Vx.Linux => CONFIG_SITE.mv162} (99%) create mode 100644 config/CONFIG_SITE.mv162lc create mode 100644 config/CONFIG_SITE.mv167 create mode 100644 config/CONFIG_SITE.niCpu030 create mode 100644 config/CONFIG_SITE.sgi create mode 100644 config/CONFIG_SITE.solaris create mode 100644 config/CONFIG_SITE.sun4 diff --git a/config/CONFIG b/config/CONFIG index 831ae2a75..da168f322 100644 --- a/config/CONFIG +++ b/config/CONFIG @@ -14,23 +14,14 @@ include $(EPICS_BASE)/config/CONFIG_COMMON ifdef T_A # Architecture specific definitions -# BUILD_TYPE and ARCH_CLASS are defined -# in this file. # -include $(EPICS_BASE)/config/CONFIG_ARCH.$(T_A) - - -# Site-specific "class" definitions +include $(EPICS_BASE)/config/CONFIG.$(T_A) # -include $(EPICS_BASE)/config/CONFIG_SITE.$(BUILD_TYPE).$(ARCH_CLASS) - -# Definitions common to a "class" of architectures -# -include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS) +include $(EPICS_BASE)/config/CONFIG_SITE.$(T_A) endif -# All EPICS options other than BUILD_TYPE, and ARCH_CLASS +# All EPICS options other than BUILD_TYPE # may be overridden here. # # EXAMPLES diff --git a/config/CONFIG.Unix.Linux b/config/CONFIG.Linux similarity index 97% rename from config/CONFIG.Unix.Linux rename to config/CONFIG.Linux index f1b8cff5e..abfab9471 100644 --- a/config/CONFIG.Unix.Linux +++ b/config/CONFIG.Linux @@ -7,6 +7,10 @@ # (with warning flags built in) # Paths to compilers +# BUILD_TYPE +# Currently either Vx or Unix +BUILD_TYPE = Unix + GCC = gcc ACC = acc SUNCC = cc @@ -63,14 +67,12 @@ UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) # Operating system flags OP_SYS_FLAGS = -DUNIX -ifdef SPECIAL_LANG -SPECIAL_LDFLAGS = -L$(SPECIAL_LANG) -endif UNIX_LDFLAGS = -L$(EPICS_BASE_LIB) UNIX_LDLIBS = -lm ARCH_DEP_CFLAGS = -D_X86_ -Dlinux ARCH_DEP_CCFLAGS = $(ARCH_DEP_CFLAGS) + UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS) UNIX_CCFLAGS = $(UNIX_CFLAGS) diff --git a/config/CONFIG.Unix.alpha b/config/CONFIG.alpha similarity index 97% rename from config/CONFIG.Unix.alpha rename to config/CONFIG.alpha index ad39bd99f..c41f568b9 100644 --- a/config/CONFIG.Unix.alpha +++ b/config/CONFIG.alpha @@ -2,6 +2,10 @@ # # This file is maintained by the EPICS community. +# BUILD_TYPE +# Currently either Vx or Unix +BUILD_TYPE = Unix + # Compiler and utility invocation (supply path to compiler here) # (with warning flags built in) # Paths to compilers diff --git a/config/CONFIG_ARCH.hkv2f b/config/CONFIG.hkv2f similarity index 64% rename from config/CONFIG_ARCH.hkv2f rename to config/CONFIG.hkv2f index 62eb8b2e1..a2fc5a872 100644 --- a/config/CONFIG_ARCH.hkv2f +++ b/config/CONFIG.hkv2f @@ -1,18 +1,17 @@ +# $Id$ +# +# This file is maintained by the EPICS community. + # BUILD_TYPE -# Currently either Vx or Unix BUILD_TYPE = Vx # For Vx directories of form: -# # $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# ARCH_CLASS = 68k +include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS) + # Architecture specific build flags ARCH_DEP_CFLAGS = -DCPU=MC68020 -m68020 -DCPU_FAMILY=MC680X0 diff --git a/config/CONFIG.Unix.hp700 b/config/CONFIG.hp700 similarity index 97% rename from config/CONFIG.Unix.hp700 rename to config/CONFIG.hp700 index 2b8c578ee..3bc648cc3 100644 --- a/config/CONFIG.Unix.hp700 +++ b/config/CONFIG.hp700 @@ -2,6 +2,10 @@ # # This file is maintained by the EPICS community. +# BUILD_TYPE +# Currently either Vx or Unix +BUILD_TYPE = Unix + # Compiler and utility invocation (supply path to compiler here) # (with warning flags built in) # Paths to compilers diff --git a/config/CONFIG_ARCH.niCpu030 b/config/CONFIG.mv147 similarity index 61% rename from config/CONFIG_ARCH.niCpu030 rename to config/CONFIG.mv147 index 602d60822..e589827de 100644 --- a/config/CONFIG_ARCH.niCpu030 +++ b/config/CONFIG.mv147 @@ -1,17 +1,15 @@ -# BUILD_TYPE -# Currently either Vx or Unix +# $Id$ +# +# This file is maintained by the EPICS community. + BUILD_TYPE = Vx # For Vx directories of form: -# # $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# ARCH_CLASS = 68k + +include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS) # Architecture specific build flags ARCH_DEP_CFLAGS = -DCPU=MC68030 -m68030 -DCPU_FAMILY=MC680X0 diff --git a/config/CONFIG_ARCH.mv167 b/config/CONFIG.mv162 similarity index 64% rename from config/CONFIG_ARCH.mv167 rename to config/CONFIG.mv162 index acada98aa..7905d0458 100644 --- a/config/CONFIG_ARCH.mv167 +++ b/config/CONFIG.mv162 @@ -1,18 +1,17 @@ +# $Id$ +# +# This file is maintained by the EPICS community. + # BUILD_TYPE -# Currently either Vx or Unix BUILD_TYPE = Vx # For Vx directories of form: -# # $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# ARCH_CLASS = 68k +include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS) + # Architecture specific build flags ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0 diff --git a/config/CONFIG_ARCH.mv162lc b/config/CONFIG.mv162lc similarity index 65% rename from config/CONFIG_ARCH.mv162lc rename to config/CONFIG.mv162lc index c71f48acc..daa0a54c2 100644 --- a/config/CONFIG_ARCH.mv162lc +++ b/config/CONFIG.mv162lc @@ -1,18 +1,16 @@ +# $Id$ +# +# This file is maintained by the EPICS community. + # BUILD_TYPE -# Currently either Vx or Unix BUILD_TYPE = Vx # For Vx directories of form: -# # $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# ARCH_CLASS = 68k +include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS) + # Architecture specific build flags ARCH_DEP_CFLAGS = -DCPU=MC68040 -msoft-float -DCPU_FAMILY=MC680X0 - diff --git a/config/CONFIG_ARCH.test167 b/config/CONFIG.mv167 similarity index 61% rename from config/CONFIG_ARCH.test167 rename to config/CONFIG.mv167 index acada98aa..fad06ee39 100644 --- a/config/CONFIG_ARCH.test167 +++ b/config/CONFIG.mv167 @@ -1,18 +1,16 @@ -# BUILD_TYPE -# Currently either Vx or Unix +# $Id$ +# +# This file is maintained by the EPICS community. + BUILD_TYPE = Vx # For Vx directories of form: -# # $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# ARCH_CLASS = 68k +include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS) + # Architecture specific build flags ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0 diff --git a/config/CONFIG_ARCH.mv147 b/config/CONFIG.niCpu030 similarity index 75% rename from config/CONFIG_ARCH.mv147 rename to config/CONFIG.niCpu030 index 602d60822..d4c3670ec 100644 --- a/config/CONFIG_ARCH.mv147 +++ b/config/CONFIG.niCpu030 @@ -7,12 +7,10 @@ BUILD_TYPE = Vx # # $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin # -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# ARCH_CLASS = 68k +include $(EPICS_BASE)/config/CONFIG.$(BUILD_TYPE).$(ARCH_CLASS) + # Architecture specific build flags ARCH_DEP_CFLAGS = -DCPU=MC68030 -m68030 -DCPU_FAMILY=MC680X0 diff --git a/config/CONFIG.Unix.sgi b/config/CONFIG.sgi similarity index 97% rename from config/CONFIG.Unix.sgi rename to config/CONFIG.sgi index 506d83876..6277aace3 100644 --- a/config/CONFIG.Unix.sgi +++ b/config/CONFIG.sgi @@ -3,6 +3,10 @@ # # This file is maintained by the EPICS community. +# BUILD_TYPE +# Currently either Vx or Unix +BUILD_TYPE = Unix + # Compiler and utility invocation (supply path to compiler here) # (with warning flags built in) # Paths to compilers @@ -62,9 +66,6 @@ UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) # Operating system flags OP_SYS_FLAGS = -DUNIX -ifdef SPECIAL_LANG -SPECIAL_LDFLAGS = -L$(SPECIAL_LANG) -endif UNIX_LDFLAGS = -L$(EPICS_BASE_LIB) UNIX_LDLIBS = -lm diff --git a/config/CONFIG.Unix.solaris b/config/CONFIG.solaris similarity index 93% rename from config/CONFIG.Unix.solaris rename to config/CONFIG.solaris index 5cd8e75b1..2d60c2361 100644 --- a/config/CONFIG.Unix.solaris +++ b/config/CONFIG.solaris @@ -3,6 +3,10 @@ # # This file is maintained by the EPICS community. +# BUILD_TYPE +# Currently either Vx or Unix +BUILD_TYPE = Unix + # Compiler and utility invocation (supply path to compiler here) # (with warning flags built in) # Paths to compilers @@ -67,14 +71,16 @@ UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) # Operating system flags OP_SYS_FLAGS = -DUNIX -ifdef SPECIAL_LANG -SPECIAL_LDFLAGS = -L$(SPECIAL_LANG) -endif UNIX_LDFLAGS = -L$(EPICS_BASE_LIB) UNIX_LDLIBS = $(UNIX_SLIBS) -lm +# Architecture specific build flags ARCH_DEP_CFLAGS = -DSOLARIS ARCH_DEP_CCFLAGS = $(ARCH_DEP_CFLAGS) +ARCH_DEP_LDLIBS = -lsocket -lnsl +# -lsocket needed by libca.a +# -lnsl needed by libca.a + UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(USR_INCLUDES) $(OP_SYS_FLAGS) UNIX_CCFLAGS = $(UNIX_CFLAGS) diff --git a/config/CONFIG.Unix.sun4 b/config/CONFIG.sun4 similarity index 98% rename from config/CONFIG.Unix.sun4 rename to config/CONFIG.sun4 index f5189cec0..9dba97659 100644 --- a/config/CONFIG.Unix.sun4 +++ b/config/CONFIG.sun4 @@ -3,6 +3,10 @@ # # This file is maintained by the EPICS community. +# BUILD_TYPE +# Currently either Vx or Unix +BUILD_TYPE = Unix + # Compiler and utility invocation (supply path to compiler here) # (with warning flags built in) # Paths to compilers @@ -63,9 +67,6 @@ UNIX_INCLUDES = -I. -I.. -I$(EPICS_BASE_INCLUDE) OP_SYS_FLAGS = -DUNIX -ifdef SPECIAL_LANG -SPECIAL_LDFLAGS = -L$(SPECIAL_LANG) -endif UNIX_LDFLAGS = -L$(EPICS_BASE_LIB) # diff --git a/config/CONFIG_ARCH.Linux b/config/CONFIG_ARCH.Linux deleted file mode 100644 index 0600db459..000000000 --- a/config/CONFIG_ARCH.Linux +++ /dev/null @@ -1,19 +0,0 @@ -# $Id$ - -# BUILD_TYPE -# Currently either Vx or Unix -BUILD_TYPE = Unix - -# For Vx directories of form: -# -# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# -ARCH_CLASS = Linux - -# Architecture specific build flags - -ARCH_DEP_LDLIBS = -D_X86_ -Dlinux diff --git a/config/CONFIG_ARCH.alpha b/config/CONFIG_ARCH.alpha deleted file mode 100644 index 31cba9b96..000000000 --- a/config/CONFIG_ARCH.alpha +++ /dev/null @@ -1,18 +0,0 @@ - -# BUILD_TYPE -# Currently either Vx or Unix -BUILD_TYPE = Unix - -# For Vx directories of form: -# -# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.alpha -# -ARCH_CLASS = alpha - -# Architecture specific build flags -ARCH_DEP_LDLIBS = - diff --git a/config/CONFIG_ARCH.hp700 b/config/CONFIG_ARCH.hp700 deleted file mode 100644 index 82f082616..000000000 --- a/config/CONFIG_ARCH.hp700 +++ /dev/null @@ -1,18 +0,0 @@ - -# BUILD_TYPE -# Currently either Vx or Unix -BUILD_TYPE = Unix - -# For Vx directories of form: -# -# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.hp700 -# -ARCH_CLASS = hp700 - -# Architecture specific build flags -ARCH_DEP_LDLIBS = - diff --git a/config/CONFIG_ARCH.mv162 b/config/CONFIG_ARCH.mv162 deleted file mode 100644 index acada98aa..000000000 --- a/config/CONFIG_ARCH.mv162 +++ /dev/null @@ -1,18 +0,0 @@ - -# BUILD_TYPE -# Currently either Vx or Unix -BUILD_TYPE = Vx - -# For Vx directories of form: -# -# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# -ARCH_CLASS = 68k - -# Architecture specific build flags -ARCH_DEP_CFLAGS = -DCPU=MC68040 -m68040 -DCPU_FAMILY=MC680X0 - diff --git a/config/CONFIG_ARCH.sgi b/config/CONFIG_ARCH.sgi deleted file mode 100644 index 741001b24..000000000 --- a/config/CONFIG_ARCH.sgi +++ /dev/null @@ -1,17 +0,0 @@ - -# BUILD_TYPE -# Currently either Vx or Unix -BUILD_TYPE = Unix - -# For Vx directories of form: -# -# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# -ARCH_CLASS = sgi - -# Architecture specific build flags - diff --git a/config/CONFIG_ARCH.solaris b/config/CONFIG_ARCH.solaris deleted file mode 100644 index 23e8b3c36..000000000 --- a/config/CONFIG_ARCH.solaris +++ /dev/null @@ -1,23 +0,0 @@ - -# BUILD_TYPE -# Currently either Vx or Unix -BUILD_TYPE = Unix - -# For Vx directories of form: -# -# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# -ARCH_CLASS = solaris - -# Architecture specific build flags -ARCH_DEP_LDLIBS = -lsocket -lnsl -lgen -# -lsocket needed by libca.a -# -lnsl needed by libca.a and libX11.so -# -lgen needed by libXm.so for extensions - -# needed for extensions -ARCH_DEP_LDFLAGS = -R$(MOTIF_LIB) -R$(X11_LIB) diff --git a/config/CONFIG_ARCH.sun4 b/config/CONFIG_ARCH.sun4 deleted file mode 100644 index f89db4ac8..000000000 --- a/config/CONFIG_ARCH.sun4 +++ /dev/null @@ -1,17 +0,0 @@ - -# BUILD_TYPE -# Currently either Vx or Unix -BUILD_TYPE = Unix - -# For Vx directories of form: -# -# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin -# -# And configuration files: -# -# CONFIG_SITE.Vx.68k -or- CONFIG_SITE.Unix.sun4 -# -ARCH_CLASS = sun4 - -# Architecture specific build flags - diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON index c9c40ce35..0f8e236fc 100644 --- a/config/CONFIG_COMMON +++ b/config/CONFIG_COMMON @@ -43,6 +43,7 @@ ELEX = $(EPICS_BASE)/bin/$(HOST_ARCH)/e_flex -S$(EPICS_BASE_INCLUDE)/flex.skel.s # install from EPICS INSTALL = $(EPICS_BASE)/bin/$(HOST_ARCH)/installEpics +INSTALL_PRODUCT = $(INSTALL) # dbtools from EPICS diff --git a/config/CONFIG_SITE b/config/CONFIG_SITE index 1291d798b..915f81639 100644 --- a/config/CONFIG_SITE +++ b/config/CONFIG_SITE @@ -34,6 +34,7 @@ endif # mv162lc # mv147 # hkv2f +# niCpu030 # CROSS_COMPILER_TARGET_ARCHS=mv167 @@ -52,8 +53,6 @@ VX_DIR=/usr/local/vw/vxV52p1/vw #VX_GNU = $(VX_DIR) VX_GNU = $(VX_DIR)/../vxgccV2.2.3.1 -# Hideos directory -HIDEOS=/home/phoebus/HIDEOS/hideos_vx # Client ANSI Compiler # GCC (gcc -ansi) diff --git a/config/CONFIG_SITE.Linux b/config/CONFIG_SITE.Linux new file mode 100644 index 000000000..6ae0598ec --- /dev/null +++ b/config/CONFIG_SITE.Linux @@ -0,0 +1,13 @@ +# +# $Id$ +# +# Site Specific Configuration Information +# Only the local epics system manager should modify this file + +# Default SUN compiler, individual Makefiles will override +# if they cannot support ANSI compilation. +# STRICT - ANSI C - force warning flags +# ANSI - ANSI C +# OLD - Standard C - Not appropriate here. +CMPLR=ANSI + diff --git a/config/CONFIG_SITE.Unix.Linux b/config/CONFIG_SITE.Unix.Linux deleted file mode 100644 index 3fe868478..000000000 --- a/config/CONFIG_SITE.Unix.Linux +++ /dev/null @@ -1,37 +0,0 @@ -# -# $Id$ -# -# Site Specific Configuration Information -# Only the local epics system manager should modify this file - -# Default SUN compiler, individual Makefiles will override -# if they cannot support ANSI compilation. -# STRICT - ANSI C - force warning flags -# ANSI - ANSI C -# OLD - Standard C - Not appropriate here. -CMPLR=ANSI - -#INSTALL_PRODUCT = $(EPICS_BASE_BIN)/InstallVersion -INSTALL_PRODUCT = $(INSTALL) - -# Special C library requirements -SPECIAL_LANG = . - -# Where to find utilities/libraries -# If you do not have a certain product, -# leave the line empty. -# -X11_LIB = /usr/X386/lib -X11_INC = /usr/X386/include/X11 -MOTIF = -MOTIF_INC = /usr/X386/include -MOTIF_LIB = /usr/X386/lib -INTERVIEWS_BIN=/usr/local/interviews/bin/O.Linux -OPENWIN = -WINGZ = -MATHEMATICA = -XRTGRAPH = -QUESTWIN = -TK_TCL = /usr/lib -IDL = - diff --git a/config/CONFIG_SITE.Unix.hp700 b/config/CONFIG_SITE.Unix.hp700 deleted file mode 100644 index 3854b34ee..000000000 --- a/config/CONFIG_SITE.Unix.hp700 +++ /dev/null @@ -1,30 +0,0 @@ -# -# CONFIG_SITE.Unix.hp700 -# -# -# Site Specific Configuration Information -# Only the local epics system manager should modify this file - -# Default compiler, individual Makefiles will override -# if they cannot support ANSI compilation. -# STRICT - ANSI C - force warning flags -# ANSI - ANSI C -# OLD - Standard C - Not appropriate here. -CMPLR=ANSI - -INSTALL_PRODUCT = $(INSTALL) - -# Special C library requirements - -# Where to find utilities/libraries -X11_INC = /usr/include/X11R5 -X11_LIB = /usr/lib/X11R5 -MOTIF_INC = /usr/include/Motif1.2 -MOTIF_LIB = /usr/lib/Motif1.2 -INTERVIEWS_BIN=/usr/local/interviews/bin/O.hp700 -XRTGRAPH = /usr/csite/xrt -OPENWIN = /usr/csite4/local/xview -WINGZ = /usr/local/Wingz -MATHEMATICA = /usr/local/math -QUESTWIN = /usr/local/questwin -IDL = /usr/csite/idl diff --git a/config/CONFIG_SITE.Unix.sgi b/config/CONFIG_SITE.Unix.sgi deleted file mode 100644 index c5dbcf837..000000000 --- a/config/CONFIG_SITE.Unix.sgi +++ /dev/null @@ -1,40 +0,0 @@ -# -# $Id$ -# -# Revision 1.2 1994/06/28 00:02:32 bordua -# First cut at the RULES and CONFIGS. -# -# Site Specific Configuration Information -# Only the local epics system manager should modify this file - -# Default SUN compiler, individual Makefiles will override -# if they cannot support ANSI compilation. -# STRICT - ANSI C - force warning flags -# ANSI - ANSI C -# OLD - Standard C - Not appropriate here. -CMPLR=ANSI - -#INSTALL_PRODUCT = $(EPICS_BASE_BIN)/InstallVersion -INSTALL_PRODUCT = $(INSTALL) - -# Special C library requirements -SPECIAL_LANG = /usr/lang/SC2.0.1patch - -# Where to find utilities/libraries -# If you do not have a certain product, -# leave the line empty. -# -X11_LIB = /usr/lib -X11_INC = /usr/include/X11 -MOTIF = /usr/local/Motif1.2.2 -MOTIF_INC = /usr/local/Motif1.2.2/include -MOTIF_LIB = /usr/local/Motif1.2.2/lib -OPENWIN = /usr/local/openwin3 -INTERVIEWS_BIN=/usr/local/interviews/bin/O.sgi -WINGZ = /usr/local/Wingz -MATHEMATICA = /usr/local/math -XRTGRAPH = /usr/local/xrtgraph -QUESTWIN = /usr/local/questwin -TK_TCL = /usr/local/tk_tcl -IDL = /usr/local/idl - diff --git a/config/CONFIG_SITE.Unix.solaris b/config/CONFIG_SITE.Unix.solaris deleted file mode 100644 index e4eb985a4..000000000 --- a/config/CONFIG_SITE.Unix.solaris +++ /dev/null @@ -1,52 +0,0 @@ -# -# $Id$ -# -# Site Specific Configuration Information -# Only the local epics system manager should modify this file - -# Default SUN compiler, individual Makefiles will override -# if they cannot support ANSI compilation. -# STRICT - ANSI C - force warning flags -# ANSI - ANSI C -# OLD - Standard C - Not appropriate here. -CMPLR=ANSI - -#INSTALL_PRODUCT = $(EPICS_BASE_BIN)/InstallVersion -INSTALL_PRODUCT = $(INSTALL) - -# Unbundled C compiler stuff -SPARCWORKS = /opt/SUNWspro -#SPECIAL_LANG = $(SPARCWORKS)/SC3.0/lib -SPECIAL_LANG = . - -# Where to find utilities/libraries -# If you do not have a certain product, -# leave the line empty. -# - -# sun X11 -X11_LIB = /usr/openwin/lib -X11_INC = /usr/openwin/include -# mit X11 -#X11_LIB = /opt/X11R5/lib -#X11_INC = /opt/X11R5/include -# osf motif -#MOTIF_INC = /opt/local/Motif2.0/include -#MOTIF_LIB = /opt/local/Motif2.0/lib -# sun SDK motif -#MOTIF_INC = /opt/SUNWmotif/include -#MOTIF_LIB = /opt/SUNWmotif/lib -# sun 5.4 SDK motif -MOTIF_INC = /usr/dt/include -MOTIF_LIB = /usr/dt/lib -OPENWIN = /usr/openwin -INTERVIEWS_BIN=/usr/local/interviews/bin/O.solaris -WINGZ = /usr/local/Wingz -#MATHEMATICA = /usr/local/math -XRTGRAPH = /opt/local/xrtgraph2.4.0 -QUESTWIN = /usr/local/questwin -TK_TCL = /opt/local/tk_tcl -IDL = /usr/local/idl -# IDL=$(IDL)/external/rpc is the sun4 version -IDLRPC = $(IDL)/external/rpc.solaris - diff --git a/config/CONFIG_SITE.Unix.sun4 b/config/CONFIG_SITE.Unix.sun4 deleted file mode 100644 index a60c4e0b0..000000000 --- a/config/CONFIG_SITE.Unix.sun4 +++ /dev/null @@ -1,37 +0,0 @@ -# -# $Id$ -# -# Site Specific Configuration Information -# Only the local epics system manager should modify this file - -# Default SUN compiler, individual Makefiles will override -# if they cannot support ANSI compilation. -# STRICT - ANSI C - force warning flags -# ANSI - ANSI C -# OLD - Standard C - Not appropriate here. -CMPLR=ANSI - -#INSTALL_PRODUCT = $(EPICS_BASE_BIN)/InstallVersion -INSTALL_PRODUCT = $(INSTALL) - -# Special C library requirements -SPECIAL_LANG = /usr/lang/SC2.0.1patch - -# Where to find utilities/libraries -# If you do not have a certain product, -# leave the line empty. -# -X11_LIB = /usr/lib -X11_INC = /usr/include/X11 -MOTIF_INC = /usr/local/Motif1.2.2/include -MOTIF_LIB = /usr/local/Motif1.2.2/lib -OPENWIN = /usr/local/openwin3 -INTERVIEWS_BIN=/usr/local/interviews/bin/O.sun4 -WINGZ = /usr/local/Wingz -MATHEMATICA = /usr/local/math -XRTGRAPH = /usr/local/xrtgraph -QUESTWIN = /usr/local/questwin -TK_TCL = /usr/local/tk_tcl -IDL = /usr/local/idl -IDLRPC = $(IDL)/external/rpc - diff --git a/config/CONFIG_SITE.Unix.alpha b/config/CONFIG_SITE.alpha similarity index 52% rename from config/CONFIG_SITE.Unix.alpha rename to config/CONFIG_SITE.alpha index 8f3f3986e..280baea6d 100644 --- a/config/CONFIG_SITE.Unix.alpha +++ b/config/CONFIG_SITE.alpha @@ -12,20 +12,3 @@ # OLD - Standard C - Not appropriate here. CMPLR=ANSI -INSTALL_PRODUCT = $(INSTALL) - -# Special C library requirements - -# Where to find utilities/libraries -X11_LIB = /usr/lib -X11_INC = /usr/include -MOTIF_INC = /usr/include -MOTIF_LIB = /usr/lib -INTERVIEWS_BIN=/usr/local/interviews/bin/O.alpha -OPENWIN = -WINGZ = -MATHEMATICA = -XRTGRAPH = /u/local/xrtgraph -QUESTWIN = -IDL = - diff --git a/config/CONFIG_SITE.Vx.68k b/config/CONFIG_SITE.hkv2f similarity index 100% rename from config/CONFIG_SITE.Vx.68k rename to config/CONFIG_SITE.hkv2f diff --git a/config/CONFIG_SITE.hp700 b/config/CONFIG_SITE.hp700 new file mode 100644 index 000000000..1ba3b3916 --- /dev/null +++ b/config/CONFIG_SITE.hp700 @@ -0,0 +1,14 @@ +# +# CONFIG_SITE.Unix.hp700 +# +# +# Site Specific Configuration Information +# Only the local epics system manager should modify this file + +# Default compiler, individual Makefiles will override +# if they cannot support ANSI compilation. +# STRICT - ANSI C - force warning flags +# ANSI - ANSI C +# OLD - Standard C - Not appropriate here. +CMPLR=ANSI + diff --git a/config/CONFIG.Vx.Linux b/config/CONFIG_SITE.mv147 similarity index 99% rename from config/CONFIG.Vx.Linux rename to config/CONFIG_SITE.mv147 index 0fcc78d9d..b65e7b023 100644 --- a/config/CONFIG.Vx.Linux +++ b/config/CONFIG_SITE.mv147 @@ -6,3 +6,4 @@ # Epics defs + diff --git a/config/CONFIG_SITE.Vx.Linux b/config/CONFIG_SITE.mv162 similarity index 99% rename from config/CONFIG_SITE.Vx.Linux rename to config/CONFIG_SITE.mv162 index 0fcc78d9d..b65e7b023 100644 --- a/config/CONFIG_SITE.Vx.Linux +++ b/config/CONFIG_SITE.mv162 @@ -6,3 +6,4 @@ # Epics defs + diff --git a/config/CONFIG_SITE.mv162lc b/config/CONFIG_SITE.mv162lc new file mode 100644 index 000000000..b65e7b023 --- /dev/null +++ b/config/CONFIG_SITE.mv162lc @@ -0,0 +1,9 @@ + +# $Id$ +# +# Site Specific Configuration Information +# Only the local epics system manager should modify this file + +# Epics defs + + diff --git a/config/CONFIG_SITE.mv167 b/config/CONFIG_SITE.mv167 new file mode 100644 index 000000000..b65e7b023 --- /dev/null +++ b/config/CONFIG_SITE.mv167 @@ -0,0 +1,9 @@ + +# $Id$ +# +# Site Specific Configuration Information +# Only the local epics system manager should modify this file + +# Epics defs + + diff --git a/config/CONFIG_SITE.niCpu030 b/config/CONFIG_SITE.niCpu030 new file mode 100644 index 000000000..b65e7b023 --- /dev/null +++ b/config/CONFIG_SITE.niCpu030 @@ -0,0 +1,9 @@ + +# $Id$ +# +# Site Specific Configuration Information +# Only the local epics system manager should modify this file + +# Epics defs + + diff --git a/config/CONFIG_SITE.sgi b/config/CONFIG_SITE.sgi new file mode 100644 index 000000000..612b9c19c --- /dev/null +++ b/config/CONFIG_SITE.sgi @@ -0,0 +1,21 @@ +# +# $Id$ +# +# Revision 1.2 1994/06/28 00:02:32 bordua +# First cut at the RULES and CONFIGS. +# +# Site Specific Configuration Information +# Only the local epics system manager should modify this file + +# Default SUN compiler, individual Makefiles will override +# if they cannot support ANSI compilation. +# STRICT - ANSI C - force warning flags +# ANSI - ANSI C +# OLD - Standard C - Not appropriate here. +CMPLR=ANSI + +# Special C library requirements +SPECIAL_LANG = /usr/lang/SC2.0.1patch +SPECIAL_LDFLAGS = -L$(SPECIAL_LANG) + + diff --git a/config/CONFIG_SITE.solaris b/config/CONFIG_SITE.solaris new file mode 100644 index 000000000..db8c36dbd --- /dev/null +++ b/config/CONFIG_SITE.solaris @@ -0,0 +1,20 @@ +# +# $Id$ +# +# Site Specific Configuration Information +# Only the local epics system manager should modify this file + +# Default SUN compiler, individual Makefiles will override +# if they cannot support ANSI compilation. +# STRICT - ANSI C - force warning flags +# ANSI - ANSI C +# OLD - Standard C - Not appropriate here. +CMPLR=ANSI + +# Unbundled C compiler stuff +SPARCWORKS = /opt/SUNWspro +#SPECIAL_LANG = $(SPARCWORKS)/SC3.0/lib +#SPECIAL_LANG = . +#SPECIAL_LDFLAGS = -L$(SPECIAL_LANG) + + diff --git a/config/CONFIG_SITE.sun4 b/config/CONFIG_SITE.sun4 new file mode 100644 index 000000000..bb985ea78 --- /dev/null +++ b/config/CONFIG_SITE.sun4 @@ -0,0 +1,23 @@ +# +# $Id$ +# +# Site Specific Configuration Information +# Only the local epics system manager should modify this file + +# Default SUN compiler, individual Makefiles will override +# if they cannot support ANSI compilation. +# STRICT - ANSI C - force warning flags +# ANSI - ANSI C +# OLD - Standard C - Not appropriate here. + +CMPLR=ANSI + +#CMPLR=STRICT +#ANSI=GCC +#STANDARD=GCC +#CPLUSPLUS=G++ + +# Special C library requirements +SPECIAL_LANG = /usr/lang/SC2.0.1patch +SPECIAL_LDFLAGS = -L$(SPECIAL_LANG) +