changes for 3.14

src/cas/build/singleThread/Makefile

@@ -1,8 +1,69 @@
+CAS := ../../..
+TOP := $(CAS)/../..
+SRC := $(CAS)/generic
+CA := $(CAS)/../ca
+IOSRC := $(CAS)/io/bsdSocket
+STSRC := $(SRC)/st
+USER_VPATH := $(SRC) $(STSRC) $(IOSRC)
 
-TOP= ../../../..
+include $(TOP)/configure/CONFIG
 
-include $(TOP)/config/CONFIG_BASE
+CXXCMPLR = STRICT
 
-include $(TOP)/config/RULES_ARCHS
+# sometimes it's good to have different C/C++ flags, not now:
+USR_CFLAGS = -I$(SRC) -I$(IOSRC) -I$(STSRC) -I$(CA) -DcaNetAddrSock
+USR_CXXFLAGS = $(USR_CFLAGS)
 
+LIBSRCS += caServer.cc
+LIBSRCS += caServerI.cc
+LIBSRCS += casCoreClient.cc
+LIBSRCS += casClient.cc
+LIBSRCS += casDGClient.cc
+LIBSRCS += casStrmClient.cc
+LIBSRCS += casPV.cc
+LIBSRCS += casPVI.cc
+LIBSRCS += casChannel.cc
+LIBSRCS += casChannelI.cc
+LIBSRCS += casPVListChan.cc
+LIBSRCS += casClientMon.cc
+LIBSRCS += casChanDelEv.cc
+LIBSRCS += casAsyncIOI.cc
+LIBSRCS += casAsyncReadIO.cc
+LIBSRCS += casAsyncWriteIO.cc
+LIBSRCS += casAsyncPVExistIO.cc
+LIBSRCS += casAsyncPVAttachIO.cc
+LIBSRCS += casEventSys.cc
+LIBSRCS += casMonitor.cc
+LIBSRCS += casMonEvent.cc
+LIBSRCS += inBuf.cc
+LIBSRCS += outBuf.cc
+LIBSRCS += dgInBuf.cc 
+LIBSRCS += casCtx.cc 
+LIBSRCS += casEventMask.cc
+LIBSRCS += ioBlocked.cc
+#LIBSRCS += casMsgIO.cc
+
+LIBSRCS += caServerOS.cc
+LIBSRCS += casIntfOS.cc
+LIBSRCS += casDGIntfOS.cc
+LIBSRCS += casDGOS.cc
+LIBSRCS += casStreamOS.cc
+
+LIBSRCS += caServerIO.cc
+LIBSRCS += casIntfIO.cc
+LIBSRCS += casDGIntfIO.cc
+LIBSRCS += casDGIO.cc
+LIBSRCS += casStreamIO.cc
+
+LIBRARY := cas
+
+LIBTYPE := SHARED
+
+PROD_LIBS := cas ca gdd Com 
+SYS_PROD_LIBS_WIN32 := ws2_32
+
+include $(TOP)/configure/RULES_BUILD
+
+clean::
+	@$(RM) -rf Templates.DB
 

src/cas/build/singleThread/Makefile.Host

@@ -1,69 +0,0 @@
-CAS := ../../..
-TOP := $(CAS)/../..
-SRC := $(CAS)/generic
-CA := $(CAS)/../ca
-IOSRC := $(CAS)/io/bsdSocket
-STSRC := $(SRC)/st
-USER_VPATH := $(SRC) $(STSRC) $(IOSRC)  
-
-include $(TOP)/config/CONFIG_BASE
-
-CXXCMPLR = STRICT
-
-# sometimes it's good to have different C/C++ flags, not now:
-USR_CFLAGS = -I$(SRC) -I$(IOSRC) -I$(STSRC) -I$(CA) -DcaNetAddrSock
-USR_CXXFLAGS = $(USR_CFLAGS)
-
-LIBSRCS += caServer.cc
-LIBSRCS += caServerI.cc
-LIBSRCS += casCoreClient.cc
-LIBSRCS += casClient.cc
-LIBSRCS += casDGClient.cc
-LIBSRCS += casStrmClient.cc
-LIBSRCS += casPV.cc
-LIBSRCS += casPVI.cc
-LIBSRCS += casChannel.cc
-LIBSRCS += casChannelI.cc
-LIBSRCS += casPVListChan.cc
-LIBSRCS += casClientMon.cc
-LIBSRCS += casChanDelEv.cc
-LIBSRCS += casAsyncIOI.cc
-LIBSRCS += casAsyncReadIO.cc
-LIBSRCS += casAsyncWriteIO.cc
-LIBSRCS += casAsyncPVExistIO.cc
-LIBSRCS += casAsyncPVAttachIO.cc
-LIBSRCS += casEventSys.cc
-LIBSRCS += casMonitor.cc
-LIBSRCS += casMonEvent.cc
-LIBSRCS += inBuf.cc
-LIBSRCS += outBuf.cc
-LIBSRCS += dgInBuf.cc 
-LIBSRCS += casCtx.cc 
-LIBSRCS += casEventMask.cc
-LIBSRCS += ioBlocked.cc
-#LIBSRCS += casMsgIO.cc
-
-LIBSRCS += caServerOS.cc
-LIBSRCS += casIntfOS.cc
-LIBSRCS += casDGIntfOS.cc
-LIBSRCS += casDGOS.cc
-LIBSRCS += casStreamOS.cc
-
-LIBSRCS += caServerIO.cc
-LIBSRCS += casIntfIO.cc
-LIBSRCS += casDGIntfIO.cc
-LIBSRCS += casDGIO.cc
-LIBSRCS += casStreamIO.cc
-
-LIBRARY := cas
-
-LIBTYPE := SHARED
-
-PROD_LIBS := cas ca gdd Com 
-SYS_PROD_LIBS_WIN32 := ws2_32
-
-include $(TOP)/config/RULES.Host
-
-clean::
-	@$(RM) -rf Templates.DB
-