From 605eb45c0dffe557eef98b0063ca2fabd1a0ce88 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Mon, 13 Sep 1999 13:46:31 +0000
Subject: [PATCH] for 3.14 only single Makefile

---
 src/ca/Makefile      | 67 ++++++++++++++++++++++++++++++++++++++++++--
 src/ca/Makefile.Host | 61 ----------------------------------------
 src/ca/Makefile.Vx   | 18 ------------
 3 files changed, 65 insertions(+), 81 deletions(-)
 delete mode 100644 src/ca/Makefile.Host
 delete mode 100644 src/ca/Makefile.Vx

diff --git a/src/ca/Makefile b/src/ca/Makefile
index 8cca632b9..fb0703932 100644
--- a/src/ca/Makefile
+++ b/src/ca/Makefile
@@ -1,7 +1,70 @@
 
 TOP=../..
 
-include $(TOP)/config/CONFIG_BASE
+include $(TOP)/configure/CONFIG
 
-include $(TOP)/config/RULES_ARCHS
+CMPLR = STRICT
+
+#
+#	includes to install from this subproject
+#
+INC += cadef.h
+INC += caerr.h
+INC += caeventmask.h
+INC += caProto.h
+
+#
+#	Contents of library: generic, special and for all systems
+#
+
+# on generic system
+LIBSRCS_DEFAULT := posix_depen.c if_depen.c
+
+# on WIN32 only
+LIBSRCS_WIN32   := windows_depen.c
+
+# on all systems
+LIBSRCS += iocinf.c
+LIBSRCS += service.c
+LIBSRCS += conn.c
+LIBSRCS += flow_control.c
+LIBSRCS += syncgrp.c
+LIBSRCS += access.c
+LIBSRCS += convert.c
+LIBSRCS += test_event.c
+LIBSRCS += bsd_depen.c
+LIBSRCS += repeater.c
+
+#       Library to build:
+#       lib$(LIBRARY).a  or   ..dll/..exp/..lib
+#
+LIBRARY := ca
+
+#	build LIBRARY as a DLL on WIN32, other systems may ignore this
+LIBTYPE := SHARED
+
+PROD := caRepeater
+
+#	libs needed to build [TEST]PRODUCT
+PROD_LIBS := ca Com Osi
+SYS_PROD_LIBS_WIN32 := ws2_32 user32 advapi32
+
+TESTPROD := catime acctst 
+
+caLib_SRCS = \
+	iocinf.o access.c test_event.c service.c flow_control.c \
+	repeater.c conn.c syncgrp.c if_depen.c bsd_depen.c vxWorks_depen.c \
+	convert.c
+
+IOC_LIBRARY_vxWorks = caLib 
+
+include $(TOP)/configure/RULES_BUILD
+
+pcatime : catime.o $(PRODDEPLIBS)
+	$(PURIFY) $(LINK.c) catime.o $(LDLIBS)
+
+pacctst : acctst.o $(PRODDEPLIBS)
+	$(PURIFY) $(LINK.c) acctst.o $(LDLIBS)
+
+#	EOF Makefile.Host
 
diff --git a/src/ca/Makefile.Host b/src/ca/Makefile.Host
deleted file mode 100644
index c52369b2f..000000000
--- a/src/ca/Makefile.Host
+++ /dev/null
@@ -1,61 +0,0 @@
-#	Makefile.Host
-
-TOP = ../../..
-include $(TOP)/config/CONFIG_BASE
-CMPLR = STRICT
-
-#
-#	includes to install from this subproject
-#
-INC += cadef.h
-INC += caerr.h
-INC += caeventmask.h
-INC += caProto.h
-
-#
-#	Contents of library: generic, special and for all systems
-#
-
-# on generic system
-LIBSRCS_DEFAULT := posix_depen.c if_depen.c
-
-# on WIN32 only
-LIBSRCS_WIN32   := windows_depen.c
-
-# on all systems
-LIBSRCS += iocinf.c
-LIBSRCS += service.c
-LIBSRCS += conn.c
-LIBSRCS += flow_control.c
-LIBSRCS += syncgrp.c
-LIBSRCS += access.c
-LIBSRCS += convert.c
-LIBSRCS += test_event.c
-LIBSRCS += bsd_depen.c
-LIBSRCS += repeater.c
-
-#       Library to build:
-#       lib$(LIBRARY).a  or   ..dll/..exp/..lib
-#
-LIBRARY := ca
-
-#	build LIBRARY as a DLL on WIN32, other systems may ignore this
-LIBTYPE := SHARED
-
-PROD := caRepeater
-
-#	libs needed to build [TEST]PRODUCT
-PROD_LIBS := ca Com
-SYS_PROD_LIBS_WIN32 := ws2_32 user32 advapi32
-
-TESTPROD := catime acctst 
-
-include $(TOP)/config/RULES.Host
-
-pcatime : catime.o $(PRODDEPLIBS)
-	$(PURIFY) $(LINK.c) catime.o $(LDLIBS)
-
-pacctst : acctst.o $(PRODDEPLIBS)
-	$(PURIFY) $(LINK.c) acctst.o $(LDLIBS)
-
-#	EOF Makefile.Host
diff --git a/src/ca/Makefile.Vx b/src/ca/Makefile.Vx
deleted file mode 100644
index 3c7b8ba87..000000000
--- a/src/ca/Makefile.Vx
+++ /dev/null
@@ -1,18 +0,0 @@
-TOP = ../../..
-include $(TOP)/config/CONFIG_BASE
-
-SRCS.c = \
-	../iocinf.c ../access.c ../test_event.c ../service.c \
-	../flow_control.c ../repeater.c ../conn.c ../syncgrp.c \
-	../if_depen.c ../bsd_depen.c ../vxWorks_depen.c ../acctst.c \
-	../catime.c ../convert.c
-
-LIBOBJS = \
-	iocinf.o access.o test_event.o service.o flow_control.o \
-	repeater.o conn.o syncgrp.o if_depen.o bsd_depen.o vxWorks_depen.o \
-	convert.o
-
-LIBNAME = caLib 
-
-include $(TOP)/config/RULES.Vx
-