From e9410e53c16f3d7f7e955815cb5d1a7fbb31503c Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Wed, 7 Mar 2001 21:13:50 +0000 Subject: [PATCH] merged_epics_R3_13_1_branchToTrunk_for_alpha2 --- config/CONFIG.Host.Borland | 138 ++++++++++++++++++---------- config/CONFIG.Host.UnixCommon | 10 +- config/CONFIG.Host.WIN32 | 2 +- config/CONFIG.Host.cygwin32 | 8 +- config/CONFIG.Host.solaris-x86 | 66 +++++++++++++ config/CONFIG.Vx.mv2700 | 16 ++++ config/CONFIG.Vx.ppc603 | 16 ++++ config/CONFIG.Vx.ppc604 | 2 +- config/CONFIG_BASE_VERSION | 9 +- config/CONFIG_HOST_ARCH.cygwin32 | 2 +- config/CONFIG_HOST_ARCH.solaris-x86 | 9 ++ config/CONFIG_SITE | 4 +- config/CONFIG_SITE.Host.Borland | 2 + config/CONFIG_SITE.Vx.Linux | 10 ++ config/CONFIG_SITE.Vx.Linux.mv167 | 11 +++ config/CONFIG_SITE.Vx.Linux.ppc603 | 11 +++ config/RULES.Host | 17 ++++ 17 files changed, 277 insertions(+), 56 deletions(-) create mode 100644 config/CONFIG.Host.solaris-x86 create mode 100644 config/CONFIG.Vx.mv2700 create mode 100644 config/CONFIG.Vx.ppc603 create mode 100644 config/CONFIG_HOST_ARCH.solaris-x86 create mode 100644 config/CONFIG_SITE.Vx.Linux create mode 100644 config/CONFIG_SITE.Vx.Linux.mv167 create mode 100644 config/CONFIG_SITE.Vx.Linux.ppc603 diff --git a/config/CONFIG.Host.Borland b/config/CONFIG.Host.Borland index cc5aa357d..f7aeda8e6 100644 --- a/config/CONFIG.Host.Borland +++ b/config/CONFIG.Host.Borland @@ -1,49 +1,75 @@ # CONFIG.Host.Borland -# # This file is maintained by the EPICS community. # Sites may override these definitions in CONFIG_SITE.Borland # Use std path variables from ms HOME = $(HOMEDRIVE)$(HOMEPATH) +BORLAND_LIB = $(BORLAND)\\lib +BORLAND_INC = $(BORLAND)\\include +BORLAND_BIN = $(BORLAND)\\bin + # # ANSI = ACC CPLUSPLUS = CCC # -# -WINLINK = ilink32 +# -q supress command line banner +WINLINK = $(BORLAND_BIN)/ilink32 -q -RCCMD = brcc32 -i . -i .. -i $(INSTALL_INCLUDE) -i $(EPICS_BASE_INCLUDE) -fo $@ $< +# -l specifies default language +# -fo Renames the output .RES file +RCCMD = $(BORLAND_BIN)/brcc32 $(subst -I,-i,$(INCLUDES)) -l0x409 -fo$@ $< -ARCMD = tlib $@ +ARCMD = $(BORLAND_BIN)/tlib $@ # -# Configure OS vendor C compiler -CCLINKOPT = -WM -D_WIN32 -ACC = bcc32 $(CCLINKOPT) +# Configure Borland C compiler +# -q suppress compiler identification banner +# -tWM generate a 32-bit multi-threaded target +# -tWD generate a .DLL executable +# -a8 quad word alignment +# -D_WIN32 macro defined to be consistant with Microsoft Visual C++ +# -D_RTLDLL macro defined to use Borland C++ RTL library +CCLINKOPT = -q -tWM -tWD -a8 -D_WIN32 -D_RTLDLL +ACC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT) # -# __STDC__=0 is a real great idea of Jeff that gives us both: -# 1) define STDC for EPICS code (pretend ANSI conformance) -# 2) set it to 0 to use MS C "extensions" (open for _open etc.) -# because MS uses: if __STDC__ ... disable many nice things +# __STDC__=0 works but not as cleanly as with +# Microsoft Visual C++. +# The Borland header files use ifdef __STDC__ +# to disable many nice things. This is overridden +# by defining NO_BORLAND_STDC in the Makefile.Host. # +ifdef NO_BORLAND_STDC +ACC_ANSI = $(ACC) +ACC_STRICT = $(ACC) +else ACC_ANSI = $(ACC) -D__STDC__=0 ACC_STRICT = $(ACC) -D__STDC__=0 -ACC_TRAD = $(ACC) /nologo +endif +ACC_TRAD = $(ACC) -# -ACC_WARN_YES = -w -g0 +# -w display warnings on +# -g0 no limit to warning messages +# some warning message here are always disabled because they are +# trivial and numerous +# -w-8012 Comparing signed and unsigned values +# -w-8060 Possibly incorrect assignment +# -w-8071 Conversion may lose significant digits +ACC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071 +# -w- display warnings off ACC_WARN_NO = -w- # -# -O1 optimization for size # -k- turn off standard stack frame -# -H- Turn off precompiled headers -# -R- Don't include browser info in .obj files -ACC_OPT_YES = -k- -H- -R- -O1 +# -H- turn off precompiled headers +# -R- don't include browser info in .obj files +# -O1 optimization for size +# -v- turn off source debugging +# -vi control expansion of inline functions +ACC_OPT_YES = -k- -H- -R- -O1 -v- -vi # ACC_OPT_NO = @@ -57,26 +83,39 @@ ACC_SLIBS_NO= # Configure OS vendor C++ compiler # -# __STDC__=0 is a real great idea of Jeff that gives us both: -# 1) define STDC for EPICS code (pretend ANSI conformance) -# 2) set it to 0 to use MS C "extensions" (open for _open etc.) -# because MS uses: if __STDC__ ... disable many nice things +# __STDC__=0 works but not as cleanly as with +# Microsoft Visual C++. +# The Borland header files use ifdef __STDC__ +# to disable many nice things. This is overridden +# by defining NO_BORLAND_STDC in the Makefile.Host. # -CCC = bcc32 $(CCLINKOPT) +CCC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT) +ifdef NO_BORLAND_STDC +CCC_NORMAL = $(CCC) +CCC_STRICT = $(CCC) +else CCC_NORMAL = $(CCC) -D__STDC__=0 CCC_STRICT = $(CCC) -D__STDC__=0 +endif CCC_TEMPL_INST_FLAG = -# -CCC_WARN_YES = -w -g0 +# -w display warnings on +# -g0 no limit to warning messages +# -w-8012 Comparing signed and unsigned values +# -w-8060 Possibly incorrect assignment +# -w-8071 Conversion may lose significant digits +CCC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071 +# -w- display warnings off CCC_WARN_NO = -w- # -# -O1 optimization for size # -k- turn off standard stack frame # -H- Turn off precompiled headers # -R- Don't include browser info in .obj files -CCC_OPT_YES = -k- -H- -R- -O1 +# -O1 optimization for size +# -v- turn off source debugging +# -vi control expansion of inline functions +CCC_OPT_YES = -k- -H- -R- -O1 -v- -vi # CCC_OPT_NO = @@ -88,16 +127,15 @@ CCC_SLIBS_YES= CCC_SLIBS_NO= PROD_VERSION=3.13 -# -w display warnings on -# -C clear state before linking -# -Gn no state files -# -x no map -# -Gi generate import library -# -Tpd this flag specifies the output file type -# -aa this flag specifies the application type # -c case sensitive linking -LINK_OPT_FLAGS_YES = -w -C -Gn -x -Gi -Tpd -aa -c -LINK_OPT_FLAGS_NO = -w- -C -Gn -x -Gi -Tpd -aa -c +# -C clear state before linking +# -Gi generate import library +# -Gn no state files +# -Tpd targets a Windows .DLL file +# -x no map +# -w display warnings on +LINK_OPT_FLAGS_YES = -c -C -Gi -Gn -Tpd -x -w +LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w- WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) OPT_LDFLAGS = @@ -111,6 +149,7 @@ ARCH_CLASS=WIN32 # ifdef WIN32 looks better that ifeq ($(ARCH_CLASS),WIN32) ?? WIN32=1 +BORLANDC=1 EXE=.exe OBJ=.obj @@ -118,7 +157,7 @@ RES=.res # Problem: BorlandC does not recognize *.cc as C++ source, # we have to compile xx.cc using the flag -P xx.cc, -SOURCE_CXXFLAG = -P +SOURCE_CXXFLAG = -P -D__cplusplus # Operating system flags OP_SYS_CFLAGS = @@ -126,13 +165,14 @@ OP_SYS_CFLAGS = # # Borland specific include files # -OP_SYS_INCLUDES = -I$(INCLUDE) +OP_SYS_INCLUDES = -I$(BORLAND_INC) # OP_SYS_LDLIBS = # # specify dll .def file only if it exists # +#DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(LIBRARY).def)) DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(LIBRARY).def)) # HOST_OPT_FLAGS is part of CFLAGS/CXXFLAGS, @@ -152,7 +192,7 @@ HOST_OPT_FLAGS += $(subst $@, /_WINDLL, $(findstring $@,$(LIBOBJS))) # x.lib: what you link to progs that use the dll (LIBNAME) # x.exp: what you need to build the dll (in no variable) # -LINK.shrlib = $(WINLINK) $(WIN32_DLLFLAGS) -L$(LIB) -L$(LIB)\\Psdk c0d32.obj +LINK.shrlib = $(WINLINK) $(WIN32_DLLFLAGS) -L$(BORLAND_LIB) -L$(BORLAND_LIB)\\Psdk c0d32.obj # adjust names of libraries to build # @@ -171,7 +211,12 @@ SHRLIBNAME = $(LIBRARY).dll # DLL_LINK_LIBNAME_YES = $(LIBRARY).lib DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) + +#ifeq ($(strip $(SHARED_LIBRARIES)),NO) +#LIBNAME = $(LIBRARY).lib +#else LIBNAME = $(LIBRARY)Obj.lib +#endif # dll install location INSTALL_SHRLIB = $(INSTALL_BIN) @@ -181,6 +226,7 @@ INSTALL_SHRLIB = $(INSTALL_BIN) OBJECT_LIB_EXT_YES = Obj.lib # object library extension for static build OBJECT_LIB_EXT_NO = .lib # object library extension for dynamic build OBJECT_LIB_EXT = $(OBJECT_LIB_EXT_$(STATIC_BUILD)) + COND_PROD_DEPLIBS = $(foreach prod,$(PROD), $(foreach lib, $($(basename $(prod))_LIBS),\ $(firstword $($(lib)_DIR) $(EPICS_BASE_LIB))/$(lib)$(OBJECT_LIB_EXT))) PRODNAME_DEPLIBS = $(foreach lib,$(PRODNAME_LIBS),$(firstword $(wildcard $($(lib)_DIR)/$(lib).lib $($(lib)_DIR)/$(lib)Obj.lib $(EPICS_BASE_LIB)/$(lib).lib $(EPICS_BASE_LIB)/$(lib)Obj.lib ) $(filter $(LIBRARY)$(OBJECT_LIB_EXT), $(lib)$(OBJECT_LIB_EXT)) )) @@ -201,18 +247,18 @@ USR_LDLIBS = $(PRODNAME_DEPLIBS) $(PROD_DEPLIBS) $(USR_DEPLIBS) $(SYS_PROD_LIBS: DLL_LDLIBS = $(DLL_DEPLIBS) $(SYS_PROD_LIBS:%=%.lib) $(OP_SYS_LDLIBS) -#multithreaded -LIBSUF=mt -# -w display warnings on +#multithreaded import library +LIBSUF=mti +# -c case sensitive linking # -C clear state before linking # -Gn no state files +# -Tpe targets a Windows .EXE file # -x no map -# -c case sensitive linking -LDFLAGS += -w -C -Gn -x -c -L$(LIB) -L$(LIB)\\Psdk +# -w display warnings on +LDFLAGS += -c -C -Gn -Tpe -x -w -L$(BORLAND_LIB) -L$(BORLAND_LIB)\\Psdk LINKSTARTUP = c0x32.obj LINKLIBS=import32.lib cw32$(LIBSUF).lib LINK.c = $(WINLINK) $(LDFLAGS) $(LINKSTARTUP) LINK.cc = $(WINLINK) $(LDFLAGS) $(LINKSTARTUP) - diff --git a/config/CONFIG.Host.UnixCommon b/config/CONFIG.Host.UnixCommon index 6290c7606..3f6eb70d5 100644 --- a/config/CONFIG.Host.UnixCommon +++ b/config/CONFIG.Host.UnixCommon @@ -1,4 +1,4 @@ -# CONFIG.Host.UnixCommon + # # Contains definitions common to all Unix archs # @@ -20,7 +20,10 @@ SHRLIB_SUFFIX = .so SHRLIBNAME = lib$(LIBRARY)$(SHRLIB_SUFFIX)$(SHRLIB_VERSION:%=.%) -DLL_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%) +#For backward compatability only +DLL_LIBS = $(subst $(LIBRARY),, $(PROD_LIBS)) + +DLL_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(DLL_LIBS:%=-l%) INSTALL_SHRLIB = $(INSTALL_LIB) @@ -61,7 +64,8 @@ USR_LDLIBS = $(PRODNAME_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\ #-------------------------------------------------- # Operating system definitions OP_SYS_INCLUDES = -OP_SYS_CFLAGS = -DUNIX +OP_SYS_CFLAGS = -DUNIX + OP_SYS_LDFLAGS = OP_SYS_LDLIBS = -lm diff --git a/config/CONFIG.Host.WIN32 b/config/CONFIG.Host.WIN32 index d0facff5e..269537f95 100644 --- a/config/CONFIG.Host.WIN32 +++ b/config/CONFIG.Host.WIN32 @@ -20,7 +20,7 @@ CPLUSPLUS = CCC MSVISC = c:\\Program\ Files\\DevStudio\\Vc WINLINK = link -RCCMD = rc -l 0x409 -i . -i .. -i $(INSTALL_INCLUDE) -i $(EPICS_BASE_INCLUDE) -fo $@ $< +RCCMD = rc -l 0x409 -i . -i .. -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) -I$(INSTALL_INCLUDE) $(INSTALL_INCLUDES) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS) -I$(EPICS_BASE_INCLUDE) -fo $@ $< ARCMD = lib /nologo /verbose /out:$@ diff --git a/config/CONFIG.Host.cygwin32 b/config/CONFIG.Host.cygwin32 index f8b7167cc..2cf095a4f 100644 --- a/config/CONFIG.Host.cygwin32 +++ b/config/CONFIG.Host.cygwin32 @@ -24,5 +24,11 @@ SHARED_LIBRARIES=NO #========================== ARCH_DEP_CFLAGS = -DCYGWIN32 -U_WIN32 -ARCH_DEP_LDLIBS = -lm +ARCH_DEP_LDLIBS = +OP_SYS_LDLIBS = + +# cygwin32 overrides to eliminate following warning message - +# -fPIC ignored for target (all code is position independent) +GCC_DEP_CFLAGS = -D_REENTRANT +G++_DEP_CFLAGS = -D_REENTRANT diff --git a/config/CONFIG.Host.solaris-x86 b/config/CONFIG.Host.solaris-x86 new file mode 100644 index 000000000..4c55de418 --- /dev/null +++ b/config/CONFIG.Host.solaris-x86 @@ -0,0 +1,66 @@ +# CONFIG.Host.solaris-x86 +# +# This file is maintained by the EPICS community. +# Sites may override these definitions in CONFIG_SITE.Host.solaris-x86 + +ARCH_CLASS = solaris + +# Include definitions common to all Unix archs +include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon + +# +# required by sun's C++ compiler +# +AR = ar +_AR = $(AR) $(ARFLAGS) +G++_AR = $(_AR) +CCC_AR = $(CCC) -xar -o +ARCMD = $($(CPLUSPLUS)_AR) $@ + +RANLIB = + +SPARCWORKS = /opt/SUNWspro + +# Configure OS vendor C compiler +ACC = $(SPARCWORKS)/bin/cc +ACC_ANSI = $(ACC) -Xa +ACC_STRICT = $(ACC) -Xc -v +ACC_TRAD = $(ACC) -Xs +ACC_DEP_CFLAGS = -KPIC -D_REENTRANT +ACC_WARN_YES = +ACC_WARN_NO = -w +ACC_OPT_YES = -O +ACC_OPT_NO = -g +ACC_SFLAGS_YES= -Bstatic +ACC_SFLAGS_NO= +ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX +ACC_SLIBS_NO= +ACC_SHRLIB_CFLAGS_YES = +ACC_SHRLIB_LDFLAGS_YES = -G -h $@ + +# Configure OS vendor C++ compiler +CCC = $(SPARCWORKS)/bin/CC +CCC_NORMAL = $(CCC) +p +CCC_STRICT = $(CCC) +p +CCC_DEP_CFLAGS = -KPIC -D_REENTRANT +CCC_TEMPL_INST_FLAG = +CCC_WARN_YES = +w +CCC_WARN_NO = +CCC_OPT_YES = -O +CCC_OPT_NO = -g +CCC_SFLAGS_YES= -Bstatic +CCC_SFLAGS_NO= +CCC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX +CCC_SLIBS_NO= +CCC_DEPENDS_FLAG = -xM1 +CCC_SHRLIB_CFLAGS_YES = +CCC_SHRLIB_LDFLAGS_YES = -G -h $@ + +GCC = gcc +G++ = g++ + +# Solaris on x86 +ARCH_DEP_CFLAGS = -DSOLARIS -D_X86_ +# socket and nsl needed by libca.a +ARCH_DEP_LDLIBS = -lsocket -lnsl + diff --git a/config/CONFIG.Vx.mv2700 b/config/CONFIG.Vx.mv2700 new file mode 100644 index 000000000..e54a4f5f9 --- /dev/null +++ b/config/CONFIG.Vx.mv2700 @@ -0,0 +1,16 @@ + +# $Id$ +# +# This file is maintained by the EPICS community. + +# Vx GNU cross compiler suffix +CMPLR_SUFFIX = ppc + +# For Vx directories of form: +# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin +ARCH_CLASS = mv2700 + +# Architecture specific build flags +ARCH_DEP_CPPFLAGS = -DCPU=PPC604 +ARCH_DEP_CFLAGS = -mcpu=604 + diff --git a/config/CONFIG.Vx.ppc603 b/config/CONFIG.Vx.ppc603 new file mode 100644 index 000000000..e627a47e2 --- /dev/null +++ b/config/CONFIG.Vx.ppc603 @@ -0,0 +1,16 @@ +# $Id$ +# +# This file is maintained by the EPICS community. + +# Vx GNU cross compiler suffix +CMPLR_SUFFIX = ppc + +# For Vx directories of form: +# $(VX_DIR)/$(HOST_ARCH).$(ARCH_CLASS)/bin +ARCH_CLASS = ppc + +# Architecture specific build flags +ARCH_DEP_CPPFLAGS = -DCPU=PPC603 -DTRUE=1 +ARCH_DEP_CFLAGS = -mcpu=603 --no-builtin -mstrict-align + +# ARCH_DEP_CFLAGS== -fsigned-char #May need for calcPerform.c diff --git a/config/CONFIG.Vx.ppc604 b/config/CONFIG.Vx.ppc604 index f81ab0c0e..71125a5df 100644 --- a/config/CONFIG.Vx.ppc604 +++ b/config/CONFIG.Vx.ppc604 @@ -11,7 +11,7 @@ ARCH_CLASS = ppc # Architecture specific build flags ARCH_DEP_CPPFLAGS = -DCPU=PPC604 -D_GNU_TOOL -DTRUE=1 -ARCH_DEP_CFLAGS = -mcpu=604 --no-builtin +ARCH_DEP_CFLAGS = -mcpu=604 --no-builtin -mstrict-align # ARCH_DEP_CFLAGS== -fsigned-char #May need for calcPerform.c diff --git a/config/CONFIG_BASE_VERSION b/config/CONFIG_BASE_VERSION index 2a7d585cd..e8e6eaa8c 100644 --- a/config/CONFIG_BASE_VERSION +++ b/config/CONFIG_BASE_VERSION @@ -11,11 +11,16 @@ EPICS_VERSION=3 EPICS_REVISION=14 EPICS_MODIFICATION=0 EPICS_UPDATE_NAME=alpha -EPICS_UPDATE_LEVEL=1 +EPICS_UPDATE_LEVEL=2 -EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}" +EPICS_LOCAL_NAME=B +EPICS_LOCAL_VERSION=0 CVS_DATE="\$$Date$$" CVS_TAG="\$$Name$$" +EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}.$(EPICS_LOCAL_NAME)$(EPICS_LOCAL_VERSION)" + +CVS_DATE="\$$Date$$" + BASE_3_14=YES diff --git a/config/CONFIG_HOST_ARCH.cygwin32 b/config/CONFIG_HOST_ARCH.cygwin32 index 5e60ebaf1..92c20f181 100644 --- a/config/CONFIG_HOST_ARCH.cygwin32 +++ b/config/CONFIG_HOST_ARCH.cygwin32 @@ -10,5 +10,5 @@ HOSTEXE=.exe TORNADO=YES -WIND_HOST_TYPE = cygwin32 +WIND_HOST_TYPE = x86-win32 diff --git a/config/CONFIG_HOST_ARCH.solaris-x86 b/config/CONFIG_HOST_ARCH.solaris-x86 new file mode 100644 index 000000000..f03f47562 --- /dev/null +++ b/config/CONFIG_HOST_ARCH.solaris-x86 @@ -0,0 +1,9 @@ +# CONFIG_HOST_ARCH.solaris-x86 +# +# Override values in CONFIG.Vx + +# Include definitions common to all Unix archs +include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon + +WIND_HOST_TYPE = x86-solaris2 + diff --git a/config/CONFIG_SITE b/config/CONFIG_SITE index 70724dc3e..bbbf3cf4e 100644 --- a/config/CONFIG_SITE +++ b/config/CONFIG_SITE @@ -21,6 +21,7 @@ # hp700 # sgi # solaris +# solaris-x86 # sun4 # # HOST_ARCH now an environment variable @@ -42,6 +43,7 @@ endif # mv162lc # mv167 # mv177 +# mv2700 # niCpu030 # pc486 # ppc604 @@ -119,7 +121,7 @@ MAKE_INC_TARGET_FIRST=NO # NOTE WIN32: YES results in a DLL. CONFIG_SITE.Host.WIN32 # distribution file contains YES override # -# NOTE solaris and sun4: If YES then LD_LIBRARY_PATH must +# NOTE solaris,Linux, and sun4: If YES then LD_LIBRARY_PATH must # include fullpathname $(INSTALL_LOCATION)/lib/$(HOST_ARCH) # for both the base build and when invoking base executables SHARED_LIBRARIES=NO diff --git a/config/CONFIG_SITE.Host.Borland b/config/CONFIG_SITE.Host.Borland index 74f6697ee..5bbcc11ac 100644 --- a/config/CONFIG_SITE.Host.Borland +++ b/config/CONFIG_SITE.Host.Borland @@ -6,3 +6,5 @@ SHARED_LIBRARIES = YES +BORLAND=C:\\Borland\\bcc55 + diff --git a/config/CONFIG_SITE.Vx.Linux b/config/CONFIG_SITE.Vx.Linux new file mode 100644 index 000000000..ca95430da --- /dev/null +++ b/config/CONFIG_SITE.Vx.Linux @@ -0,0 +1,10 @@ +# $Id$ +# +# This file contains overrides for Vx builds + +# The definitions VX_DIR, VX_GNU, GNU_DIR, GNU_LIB, etc. +# can be overridden for specific Linux-target architecture +# combinations by creating a CONFIG_SITE.Vx.Linux. +# file with the override definitions. + +-include $(EPICS_BASE)/config/CONFIG_SITE.$(BUILD_TYPE).$(HOST_ARCH).$(T_A) diff --git a/config/CONFIG_SITE.Vx.Linux.mv167 b/config/CONFIG_SITE.Vx.Linux.mv167 new file mode 100644 index 000000000..a76e35a66 --- /dev/null +++ b/config/CONFIG_SITE.Vx.Linux.mv167 @@ -0,0 +1,11 @@ +# $Id$ +# +# This file contains overrides for Vx builds + +# ORNL SNS overrides for cross compilers +#VX_DIR_YES = /opt/tornado20/ +#VX_CONFIG_DIR_YES = $(VX_DIR)/target/config +#VX_INCLUDE_YES = /usr/local/crossgcc/m68k/m68k-wrs-vxworks/sys-include +#VX_GNU_YES = /usr/local/crossgcc/m68k/ +#VX_GNU_BIN_YES = $(VX_GNU)/bin +#VX_GNU_LIB_YES = /usr/local/crossgcc/m68k/lib/gcc-lib/m68k-wrs-vxworks/2.95.2 diff --git a/config/CONFIG_SITE.Vx.Linux.ppc603 b/config/CONFIG_SITE.Vx.Linux.ppc603 new file mode 100644 index 000000000..084223cbd --- /dev/null +++ b/config/CONFIG_SITE.Vx.Linux.ppc603 @@ -0,0 +1,11 @@ +# $Id$ +# +# This file contains overrides for Vx builds + +# ORNL SNS overrides for cross compilers +#VX_DIR_YES = /opt/tornado20/ +#VX_CONFIG_DIR_YES = $(VX_DIR)/target/config +#VX_INCLUDE_YES = /usr/local/crossgcc/ppc/powerpc-wrs-vxworks/sys-include +#VX_GNU_YES = /usr/local/crossgcc/ppc/ +#VX_GNU_BIN_YES = $(VX_GNU)/bin +#VX_GNU_LIB_YES = /usr/local/crossgcc/ppc/lib/gcc-lib/powerpc-wrs-vxworks/2.95.2 diff --git a/config/RULES.Host b/config/RULES.Host index d4c3a7265..791d67954 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -29,6 +29,7 @@ vpath %.h $(USER_VPATH) vpath %.c $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic .. vpath %.cc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic .. +vpath %.cpp $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic .. vpath %.rc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic .. # check for add-on CFLAGS and CXXFLAGS @@ -281,7 +282,9 @@ endif #--------------------------------------------------------------- # always use c++ linker +ifneq ($(strip $(CPLUSPLUS)),) LINK.c = $(LINK.cc) +endif # CPLUSPLUS #--------------------------------------------------------------- # Version number for base shared libraries (and win32 products) @@ -532,6 +535,11 @@ ifeq ($(HOST_ARCH),Borland) $(COMPILE.cc) $< $(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) , $@ ,,$(LINKLIBS) $(subst /,\\,$(LDLIBS)) +%$(EXE): %.cpp + @$(RM) $@ + $(COMPILE.cc) $< + $(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) , $@ ,,$(LINKLIBS) $(subst /,\\,$(LDLIBS)) + %$(EXE): %.C @$(RM) $@ $(COMPILE.cc) $< @@ -549,6 +557,11 @@ else $(COMPILE.cc) $< $(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS) +%$(EXE): %.cpp + @$(RM) $@ + $(COMPILE.cc) $< + $(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS) + %$(EXE): %.C @$(RM) $@ $(COMPILE.cc) $< @@ -564,6 +577,10 @@ endif @$(RM) $@ $(COMPILE.cc) $< +%$(OBJ): %.cpp + @$(RM) $@ + $(COMPILE.cc) $< + %$(OBJ): %.C @$(RM) $@ $(COMPILE.cc) $<