From a278c97d5a21238a7c7e89dcd64cae728456196b Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Thu, 18 Nov 1999 14:39:48 +0000
Subject: [PATCH] new way to build

---
 src/cas/build/Makefile                        |  4 +-
 src/cas/build/Makefile.Host                   | 67 +++++++++++++++++++
 src/cas/build/Makefile.Ioc                    | 67 +++++++++++++++++++
 src/cas/build/singleThread/Makefile           | 65 +-----------------
 src/cas/example/directoryService/Makefile     | 32 +--------
 .../example/directoryService/Makefile.Host    | 33 +++++++++
 src/cas/example/iocmonitor/Makefile           |  5 +-
 src/cas/example/iocmonitor/Makefile.Host      | 28 ++++++++
 src/cas/example/simple/Makefile               | 27 +-------
 src/cas/example/simple/Makefile.Host          | 31 +++++++++
 src/cas/example/testdb/Makefile               |  5 +-
 src/cas/example/testdb/Makefile.Host          | 23 +++++++
 12 files changed, 262 insertions(+), 125 deletions(-)
 create mode 100644 src/cas/build/Makefile.Host
 create mode 100644 src/cas/build/Makefile.Ioc
 create mode 100644 src/cas/example/directoryService/Makefile.Host
 create mode 100644 src/cas/example/iocmonitor/Makefile.Host
 create mode 100644 src/cas/example/simple/Makefile.Host
 create mode 100644 src/cas/example/testdb/Makefile.Host

diff --git a/src/cas/build/Makefile b/src/cas/build/Makefile
index a339492fc..8984d6975 100644
--- a/src/cas/build/Makefile
+++ b/src/cas/build/Makefile
@@ -3,8 +3,6 @@ TOP=../../..
 
 include $(TOP)/configure/CONFIG
 
-DIRS = singleThread 
-
-include $(TOP)/configure/RULES_DIRS
+include $(TOP)/configure/RULES_ARCHS
 
 
diff --git a/src/cas/build/Makefile.Host b/src/cas/build/Makefile.Host
new file mode 100644
index 000000000..0426713b9
--- /dev/null
+++ b/src/cas/build/Makefile.Host
@@ -0,0 +1,67 @@
+TOP := ../../..
+CAS := $(TOP)/src/cas
+SRC := $(CAS)/generic
+CA := $(CAS)/../ca
+IOSRC := $(CAS)/io/bsdSocket
+STSRC := $(SRC)/st
+USER_VPATH := $(SRC) $(STSRC) $(IOSRC)
+
+include $(TOP)/configure/CONFIG
+
+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
+
+PROD_LIBS := cas ca gdd Com 
+SYS_PROD_LIBS_WIN32 := ws2_32
+
+include $(TOP)/configure/RULES_BUILD
+
+clean::
+	@$(RM) -rf Templates.DB
+
diff --git a/src/cas/build/Makefile.Ioc b/src/cas/build/Makefile.Ioc
new file mode 100644
index 000000000..0426713b9
--- /dev/null
+++ b/src/cas/build/Makefile.Ioc
@@ -0,0 +1,67 @@
+TOP := ../../..
+CAS := $(TOP)/src/cas
+SRC := $(CAS)/generic
+CA := $(CAS)/../ca
+IOSRC := $(CAS)/io/bsdSocket
+STSRC := $(SRC)/st
+USER_VPATH := $(SRC) $(STSRC) $(IOSRC)
+
+include $(TOP)/configure/CONFIG
+
+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
+
+PROD_LIBS := cas ca gdd Com 
+SYS_PROD_LIBS_WIN32 := ws2_32
+
+include $(TOP)/configure/RULES_BUILD
+
+clean::
+	@$(RM) -rf Templates.DB
+
diff --git a/src/cas/build/singleThread/Makefile b/src/cas/build/singleThread/Makefile
index 4c816fece..fb7cc8d5b 100644
--- a/src/cas/build/singleThread/Makefile
+++ b/src/cas/build/singleThread/Makefile
@@ -1,68 +1,5 @@
 TOP := ../../../..
-CAS := $(TOP)/src/cas
-SRC := $(CAS)/generic
-CA := $(CAS)/../ca
-IOSRC := $(CAS)/io/bsdSocket
-STSRC := $(SRC)/st
-USER_VPATH := $(SRC) $(STSRC) $(IOSRC)
 
 include $(TOP)/configure/CONFIG
 
-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_DEFAULT := cas
-LIBRARY_vxWorks :=
-
-PROD_LIBS := cas ca gdd Com 
-SYS_PROD_LIBS_WIN32 := ws2_32
-
-include $(TOP)/configure/RULES_BUILD
-
-clean::
-	@$(RM) -rf Templates.DB
-
+include $(TOP)/configure/RULES_ARCHS
diff --git a/src/cas/example/directoryService/Makefile b/src/cas/example/directoryService/Makefile
index 7a4fe4bba..5f7b243f6 100644
--- a/src/cas/example/directoryService/Makefile
+++ b/src/cas/example/directoryService/Makefile
@@ -1,34 +1,6 @@
 
 TOP=../../../..
+
 include $(TOP)/configure/CONFIG
 
-CXXCMPLR = STRICT
-
-PROD_LIBS := cas ca gdd Com
-cas_DIR = $(INSTALL_LIB)
-ca_DIR = $(INSTALL_LIB)
-gdd_DIR = $(INSTALL_LIB)
-Com_DIR = $(INSTALL_LIB)
-
-#
-# Added winmm user32 for the non-dll build
-#
-SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32
-
-SRCS += main.cc
-SRCS += directoryServer.cc
-
-PROD_DEFAULT := caDirServ
-PROD_vxWorks :=
-
-include $(TOP)/configure/RULES_BUILD
-
-pcaDirServ: $(PROD_OBJS) $(PRODDEPLIBS)
-	$(PURIFY) $(PROD_LINKER) $(PROD_OBJS) $(LDLIBS)
-
-clean::
-	@$(RM) caDirServ
-	@$(RM) pcaDirServ
-	@$(RM) -rf Templates.DB
-	@$(RM) core 
-
+include $(TOP)/configure/RULES_ARCHS
diff --git a/src/cas/example/directoryService/Makefile.Host b/src/cas/example/directoryService/Makefile.Host
new file mode 100644
index 000000000..5ea559292
--- /dev/null
+++ b/src/cas/example/directoryService/Makefile.Host
@@ -0,0 +1,33 @@
+
+TOP=../../../..
+include $(TOP)/configure/CONFIG
+
+CXXCMPLR = STRICT
+
+PROD_LIBS := cas ca gdd Com
+cas_DIR = $(INSTALL_LIB)
+ca_DIR = $(INSTALL_LIB)
+gdd_DIR = $(INSTALL_LIB)
+Com_DIR = $(INSTALL_LIB)
+
+#
+# Added winmm user32 for the non-dll build
+#
+SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32
+
+SRCS += main.cc
+SRCS += directoryServer.cc
+
+PROD = caDirServ
+
+include $(TOP)/configure/RULES_BUILD
+
+pcaDirServ: $(PROD_OBJS) $(PRODDEPLIBS)
+	$(PURIFY) $(PROD_LINKER) $(PROD_OBJS) $(LDLIBS)
+
+clean::
+	@$(RM) caDirServ
+	@$(RM) pcaDirServ
+	@$(RM) -rf Templates.DB
+	@$(RM) core 
+
diff --git a/src/cas/example/iocmonitor/Makefile b/src/cas/example/iocmonitor/Makefile
index 094c62d20..09fdee4ee 100644
--- a/src/cas/example/iocmonitor/Makefile
+++ b/src/cas/example/iocmonitor/Makefile
@@ -1,5 +1,8 @@
 
 # $Log$
+# Revision 1.3  1999/09/13 14:09:37  mrk
+# for 3.14 only a single Makefile
+#
 # Revision 1.2  1997/05/13 14:22:58  jbk
 # added comments at top
 #
@@ -8,5 +11,5 @@ TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
-include $(TOP)/configure/RULES_BUILD
+include $(TOP)/configure/RULES_ARCHS
 
diff --git a/src/cas/example/iocmonitor/Makefile.Host b/src/cas/example/iocmonitor/Makefile.Host
new file mode 100644
index 000000000..82fdf0731
--- /dev/null
+++ b/src/cas/example/iocmonitor/Makefile.Host
@@ -0,0 +1,28 @@
+
+# $Log$
+# Revision 1.3  1999/09/13 14:09:37  mrk
+# for 3.14 only a single Makefile
+#
+# Revision 1.2  1997/05/13 14:22:58  jbk
+# added comments at top
+#
+
+TOP=../../../..
+
+include $(TOP)/configure/CONFIG
+
+CXXCMPLR = STRICT
+
+PROD_LIBS := cas ca gdd Com
+
+SRCS += mon.cc monAdl.cc monNode.cc monServer.cc
+
+PROD := iocMonitor
+
+include $(TOP)/config/RULES_BUILD
+
+clean::
+	@$(RM) iocMonitor 
+	@$(RM) -rf Templates.DB
+	@$(RM) core 
+
diff --git a/src/cas/example/simple/Makefile b/src/cas/example/simple/Makefile
index 111da2112..f4ac443d0 100644
--- a/src/cas/example/simple/Makefile
+++ b/src/cas/example/simple/Makefile
@@ -3,30 +3,5 @@ TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
-CXXCMPLR = STRICT
-
-PROD_LIBS := cas ca gdd Com
-cas_DIR = $(INSTALL_LIB)
-ca_DIR = $(INSTALL_LIB)
-gdd_DIR = $(INSTALL_LIB)
-Com_DIR = $(INSTALL_LIB)
-
-#
-# Added ws2_32 winmm user32 for the non-dll build
-#
-SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32
-
-SRCS += main.cc
-SRCS += exServer.cc
-SRCS += exPV.cc
-SRCS += exVectorPV.cc
-SRCS += exScalarPV.cc
-SRCS += exAsyncPV.cc
-SRCS += exChannel.cc
-
-PROD_DEFAULT := excas
-PROD_vxWorks :=
-
-include $(TOP)/configure/RULES_BUILD
-
+include $(TOP)/configure/RULES_ARCHS
 
diff --git a/src/cas/example/simple/Makefile.Host b/src/cas/example/simple/Makefile.Host
new file mode 100644
index 000000000..d0e146cde
--- /dev/null
+++ b/src/cas/example/simple/Makefile.Host
@@ -0,0 +1,31 @@
+
+TOP=../../../..
+
+include $(TOP)/configure/CONFIG
+
+CXXCMPLR = STRICT
+
+PROD_LIBS := cas ca gdd Com
+cas_DIR = $(INSTALL_LIB)
+ca_DIR = $(INSTALL_LIB)
+gdd_DIR = $(INSTALL_LIB)
+Com_DIR = $(INSTALL_LIB)
+
+#
+# Added ws2_32 winmm user32 for the non-dll build
+#
+SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32
+
+SRCS += main.cc
+SRCS += exServer.cc
+SRCS += exPV.cc
+SRCS += exVectorPV.cc
+SRCS += exScalarPV.cc
+SRCS += exAsyncPV.cc
+SRCS += exChannel.cc
+
+PROD = excas
+
+include $(TOP)/configure/RULES_BUILD
+
+
diff --git a/src/cas/example/testdb/Makefile b/src/cas/example/testdb/Makefile
index 49ab9b6c6..2fd2e8ac4 100644
--- a/src/cas/example/testdb/Makefile
+++ b/src/cas/example/testdb/Makefile
@@ -1,5 +1,8 @@
 
 # $Log$
+# Revision 1.3  1999/09/13 14:09:40  mrk
+# for 3.14 only a single Makefile
+#
 # Revision 1.2  1997/03/05 21:16:21  jbk
 # Fixes cvs log id at top
 #
@@ -8,5 +11,5 @@ TOP=../../../..
 
 include $(TOP)/configure/CONFIG
 
-include $(TOP)/configure/RULES_BUILD
+include $(TOP)/configure/RULES_ARCHS
 
diff --git a/src/cas/example/testdb/Makefile.Host b/src/cas/example/testdb/Makefile.Host
new file mode 100644
index 000000000..f02813e36
--- /dev/null
+++ b/src/cas/example/testdb/Makefile.Host
@@ -0,0 +1,23 @@
+
+# $Log$
+# Revision 1.3  1999/09/13 14:09:40  mrk
+# for 3.14 only a single Makefile
+#
+# Revision 1.2  1997/03/05 21:16:21  jbk
+# Fixes cvs log id at top
+#
+
+TOP=../../../..
+
+include $(TOP)/configure/CONFIG
+
+CXXCMPLR = STRICT
+
+PROD_LIBS := cas ca gdd Com
+
+SRCS += pvServ.cc
+
+PROD :=pvServ
+
+include $(TOP)/configure/RULES_BUILD
+