Split up src/util

Move log server into libCom with the log client.
Move caRepeater init script and ca_test into ca/client/

src/Makefile

@@ -48,9 +48,6 @@ ioc/db_DEPEND_DIRS = ioc/bpt ca/client
 DIRS += ioc/as
 ioc/as_DEPEND_DIRS = ioc/db libCom/as
 
-DIRS += util
-util_DEPEND_DIRS = ca/client
-
 DIRS += ioc/dbtemplate
 ioc/dbtemplate_DEPEND_DIRS = ioc/db
 

src/ca/client/Makefile

@@ -95,5 +95,18 @@ caConnTest_SRCS = caConnTestMain.cpp caConnTest.cpp
 
 casw_SYS_LIBS_solaris = socket
 
+SCRIPTS_solaris := S99caRepeater
+SCRIPTS_Linux := S99caRepeater
+
+SRC_DIRS += $(TOP)/src/ca/client/test
+PROD_HOST += ca_test
+ca_test_SRCS = ca_test_main.c ca_test.c
+ca_test_LIBS  = ca Com
+ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
+
+OBJS_vxWorks += ca_test
+
 include $(TOP)/configure/RULES
 
+S99%: ../rc2.%
+	sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@

src/libCom/Makefile

@@ -110,12 +110,23 @@ SRCS += iocsh.cpp
 SRCS += registry.c
 SRCS += libComRegister.c
 
-SRC_DIRS += $(LIBCOM)/logClient
+SRC_DIRS += $(LIBCOM)/log
 INC += iocLog.h
 INC += logClient.h
 SRCS += iocLog.c
 SRCS += logClient.c
 
+PROD_HOST += iocLogServer
+
+iocLogServer_SYS_LIBS_solaris += socket
+iocLogServer_SYS_LIBS_WIN32   += user32
+
+iocLogServer_SRCS = iocLogServer.c
+iocLogServer_LIBS  = Com
+
+SCRIPTS_solaris := S99logServer
+SCRIPTS_Linux := S99logServer
+
 SRC_DIRS += $(LIBCOM)/macLib
 INC += macLib.h
 SRCS += macCore.c
@@ -321,6 +332,9 @@ errSymTbl.c: $(ERR_S_FILES) $(LIBCOM)/error/makeStatTbl.pl
 $(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SITE
 	$(PERL) $(LIBCOM)/misc/makeEpicsVersion.pl $(CONFIG)/CONFIG_BASE_VERSION $(@D) $(EPICS_SITE_VERSION)
 
+S99%: ../log/rc2.%
+	sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
+
 clean::
 	@$(RM) errSymTbl.c envData.c
 

src/util/Makefile

@@ -1,35 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_LIBS  = ca Com
-
-#
-# Added winmm user32 for the non-dll build
-#
-PROD_HOST_DEFAULT = ca_test iocLogServer
-PROD_HOST_WIN32   = ca_test iocLogServer
-PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-iocLogServer_SYS_LIBS_solaris = socket
-
-ca_test_SRCS = ca_test_main.c ca_test.c
-iocLogServer_SRCS = iocLogServer.c
-
-OBJS_vxWorks = ca_test
-
-SCRIPTS_solaris := S99logServer S99caRepeater 
-SCRIPTS_Linux := S99logServer S99caRepeater 
-
-include $(TOP)/configure/RULES
- 
-S99%: ../rc2.%
-	sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@