From e8dec4073da48650c47cc80e16a26b1e7a06c149 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 30 Jan 2001 16:00:46 +0000 Subject: [PATCH] Updated comments --- configure/CONFIG | 4 +-- configure/RULES.Db | 2 ++ configure/Sample.Makefile | 28 +++++++++---------- configure/os/CONFIG.linux-x86.Common | 2 +- configure/os/CONFIG.solaris-x86.Common | 2 +- configure/os/CONFIG_SITE.linux-x86.Common | 8 ++++-- .../os/CONFIG_SITE.linux-x86.vxWorks-68040 | 2 +- .../os/CONFIG_SITE.linux-x86.vxWorks-ppc603 | 8 ++++-- .../os/CONFIG_SITE.linux-x86.vxWorksCommon | 12 ++++---- configure/os/CONFIG_SITE.solaris-sparc.Common | 2 +- configure/os/CONFIG_SITE.win32-x86.Common | 4 ++- 11 files changed, 42 insertions(+), 32 deletions(-) diff --git a/configure/CONFIG b/configure/CONFIG index 1cd2752b5..00a5504a3 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -93,9 +93,7 @@ endif #CROSS_WARN=YES #etc. -#CROSS_COMPILER_TARGET_ARCHS=mv167 -#ANSI=GCC -#CPLUSPLUS=G++ +#CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040 #CMPLR=STRICT #CXXCMPLR=STRICT diff --git a/configure/RULES.Db b/configure/RULES.Db index f5cc701eb..574124fab 100644 --- a/configure/RULES.Db +++ b/configure/RULES.Db @@ -15,7 +15,9 @@ DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) ##################################################### Targets +# Following line added for backward compatibilty DBD += $(DBDNAME) + DBD += $(addsuffix .dbd,$(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC)))) INC += $(addsuffix .h,$(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC)))) diff --git a/configure/Sample.Makefile b/configure/Sample.Makefile index be7a8f0df..280d962e2 100755 --- a/configure/Sample.Makefile +++ b/configure/Sample.Makefile @@ -18,18 +18,16 @@ include $(TOP)/configure/CONFIG # # This is used on all systems: USR_CFLAGS = -DVAR=value -Ddefine_for_all_systems -# This is added to the above, but only for OS_CLASS=BSD: -USR_CFLAGS_BSD = -DVERSION='Berkeley enhanced' # ..only for WIN32: USR_CFLAGS_WIN32 = -DVERSION='WIN32 port' # # -nil- is special: -# if USR_CFLAGS_SYSV was undefined or empty, .._DEFAULT would have +# if USR_CFLAGS_WIN32 was undefined or empty, .._DEFAULT would have # been used. # To indicate -# "yes, there is a special USR_CFLAGS for SYSV, but it's empty" +# "yes, there is a special USR_CFLAGS for WIN32, but it's empty" # you have to set it to -nil-: -USR_CFLAGS_SYSV = -nil- +USR_CFLAGS_WIN32 = -nil- # .. for all other arch classes: USR_CFLAGS_DEFAULT = -DVERSION='generic Unix' @@ -58,7 +56,7 @@ a_file_CFLAGS_WIN32 = -DVERSION='WIN32 port' # INC_DEFAULT = for_all_but_WIN32_or_hp700.h INC_WIN32 = only_for_WIN32.h -INC_hp700 = -nil- # hp700 uses no special include +INC_hpux = -nil- # hpux uses no special include INC = file.h # -------------------------------------------------------------------- @@ -85,17 +83,17 @@ INC = file.h SRCS = file_for_lib.c another_file.cpp SRCS_DEFAULT = posix.c SRCS_WIN32 = win32_special.c -SRCS_BSD = -nil- +SRCS_Linux = -nil- # -_SRCS = file_for_lib.c another_file.cpp -_SRCS_DEFAULT = posix.c -_SRCS_WIN32 = win32_special.c -_SRCS_BSD = -nil- +libname_SRCS = file_for_lib.c another_file.cpp +libname_SRCS_DEFAULT = posix.c +libname_SRCS_WIN32 = win32_special.c +libname_SRCS_Linux = -nil- # LIBSRCS = file_for_lib.c another_file.cpp LIBSRCS_DEFAULT = posix.c LIBSRCS_WIN32 = win32_special.c -LIBSRCS_BSD = -nil- +LIBSRCS_Linux = -nil- # Library to build: # lib$(LIBRARY).a or ..dll/..exp/..lib @@ -167,8 +165,8 @@ foolib_DIR = $(FOO_LIB) PROD = prod PROD_DEFAULT = product_for_rest PROD_WIN32 = product_only_for_WIN32 -PROD_BSD = product_only_for_BSD -PROD_SYSV = product_only_for_SYSV +PROD_Linux = product_only_for_Linux +PROD_solaris = product_only_for_solaris # Product version PROD_VERSION = @@ -182,7 +180,7 @@ PROD_VERSION = # SCRIPTS_DEFAULT = script_for_rest SCRIPTS_WIN32 = script_only_for_WIN32 -SCRIPTS_BSD = script_only_for_BSD +SCRIPTS_Linux = script_only_for_Linux SCRIPTS = script # if you want to build products locally without installing: diff --git a/configure/os/CONFIG.linux-x86.Common b/configure/os/CONFIG.linux-x86.Common index 91185939c..cefc0857c 100644 --- a/configure/os/CONFIG.linux-x86.Common +++ b/configure/os/CONFIG.linux-x86.Common @@ -3,7 +3,7 @@ # $Id$ # This file is maintained by the build community. # -# Definitions for linux-x86 host archs +# Definitions for linux-x86 host builds # Sites may override these definitions in CONFIG_SITE.linux-x86.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-x86.Common b/configure/os/CONFIG.solaris-x86.Common index 45c1056e9..e58c0c753 100644 --- a/configure/os/CONFIG.solaris-x86.Common +++ b/configure/os/CONFIG.solaris-x86.Common @@ -3,7 +3,7 @@ # $Id$ # This file is maintained by the build community. # -# Definitions for solaris-x86 host archs +# Definitions for solaris-x86 host builds # Sites may override these definitions in CONFIG_SITE.solaris-x86.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common index ad70708f4..f5ee13a05 100644 --- a/configure/os/CONFIG_SITE.linux-x86.Common +++ b/configure/os/CONFIG_SITE.linux-x86.Common @@ -1,10 +1,13 @@ +# CONFIG_SITE.linux-x86.Common # # $Id$ +# This file is maintained by the build community. # -# Site Specific Configuration Information -# Only the local epics system manager should modify this file +# Site override definitions for linux-x86 host builds +#------------------------------------------------------- # JBA test override values +#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 # NOTE: If YES then LD_LIBRARY_PATH must include the full @@ -13,3 +16,4 @@ # Alternatively the full pathname can be added to /etc/ld.so.conf # and ldconfig run to inform the system of the shared libraries. SHARED_LIBRARIES=YES + diff --git a/configure/os/CONFIG_SITE.linux-x86.vxWorks-68040 b/configure/os/CONFIG_SITE.linux-x86.vxWorks-68040 index 9b97a69bb..2aede7b40 100644 --- a/configure/os/CONFIG_SITE.linux-x86.vxWorks-68040 +++ b/configure/os/CONFIG_SITE.linux-x86.vxWorks-68040 @@ -2,7 +2,7 @@ # # $Id$ # -# Site specific definitions for vxWorks-68040 target when host is linux-x86 +# Site specific definitions for linux-x86 host - vxWorks-68040 target builds # Only the local epics system manager should modify this file #------------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603 b/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603 index 80c16e1b4..dddcd67c6 100644 --- a/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603 +++ b/configure/os/CONFIG_SITE.linux-x86.vxWorks-ppc603 @@ -1,6 +1,10 @@ -# $Id$ +# CONFIG_SITE.linux-x86.vxWorks-ppc603 # -# This file contains overrides for Vx builds +# $Id$ +# This file is maintained by the build community. +# +# Site override definitions for linux-x86 host - vxWorks-ppc603 target builds +#------------------------------------------------------- # ORNL SNS overrides for cross compilers #VX_DIR_YES = /opt/tornado20/ diff --git a/configure/os/CONFIG_SITE.linux-x86.vxWorksCommon b/configure/os/CONFIG_SITE.linux-x86.vxWorksCommon index 9c533bf86..4e551af4b 100644 --- a/configure/os/CONFIG_SITE.linux-x86.vxWorksCommon +++ b/configure/os/CONFIG_SITE.linux-x86.vxWorksCommon @@ -1,13 +1,15 @@ +# CONFIG_SITE.linux-x86.vxWorksCommon # # $Id$ +# This file is maintained by the build community. # -# Site Specific Configuration Information -# Only the local epics system manager should modify this file +# Definitions for linux-x86 host - vxWorks target builds +#------------------------------------------------------- # JBA test override values #GNU_DIR=/home/phoebus/JBA/gnu -#VX_INCLUDE=$(GNU_DIR)/$(GNU_TARGET)/include -#GCC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX) -#G++ = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX) +#GNU_TARGET_INCLUDE_DIR=$(GNU_DIR)/$(GNU_TARGET)/include +#CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX) +#CCC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX) diff --git a/configure/os/CONFIG_SITE.solaris-sparc.Common b/configure/os/CONFIG_SITE.solaris-sparc.Common index 76f9b882d..e466ea1cd 100644 --- a/configure/os/CONFIG_SITE.solaris-sparc.Common +++ b/configure/os/CONFIG_SITE.solaris-sparc.Common @@ -2,7 +2,7 @@ # # $Id$ # -# Site specific definitions for solaris-sparc host +# Site specific override definitions for solaris-sparc host builds # Only the local epics system manager should modify this file #INSTALL_LOCATION = /home/phoebus/JBA/testBaseNew diff --git a/configure/os/CONFIG_SITE.win32-x86.Common b/configure/os/CONFIG_SITE.win32-x86.Common index 3725fdf4c..15825d3fd 100644 --- a/configure/os/CONFIG_SITE.win32-x86.Common +++ b/configure/os/CONFIG_SITE.win32-x86.Common @@ -9,4 +9,6 @@ #CROSS_COMPILER_TARGET_ARCHS=vxWorks-486 #VX_DIR = D:/tornado #INSTALL_LOCATION = G:/testInstall - +#STATIC_BUILD=YES +#SHARED_LIBRARIES=NO +#CROSS_COMPILER_TARGET_ARCHS=