Move asHost to libCom/as

src/Makefile

@@ -27,6 +27,9 @@ libCom_DEPEND_DIRS = tools
 DIRS += libCom/tools
 libCom/tools_DEPEND_DIRS = libCom
 
+DIRS += libCom/as
+libCom/as_DEPEND_DIRS = libCom libCom/tools
+
 DIRS += ca/client
 ca/client_DEPEND_DIRS = libCom
 
@@ -43,7 +46,7 @@ DIRS += ioc/db
 ioc/db_DEPEND_DIRS = ioc/bpt ca/client
 
 DIRS += ioc/as
-ioc/as_DEPEND_DIRS = ioc/db
+ioc/as_DEPEND_DIRS = ioc/db libCom/as
 
 DIRS += util
 util_DEPEND_DIRS = ca/client

src/ioc/as/Makefile

@@ -9,37 +9,22 @@
 TOP=../../..
 include $(TOP)/configure/CONFIG
 
-INC += asLib.h
 INC += asDbLib.h
 INC += asCa.h
-INC += asTrapWrite.h
 INC += asIocRegister.h
 
-LIB_SRCS += asLib.c
-LIB_SRCS += asTrapWrite.c
-
 asIoc_SRCS += asDbLib.c
 asIoc_SRCS += asCa.c
 asIoc_SRCS += asIocRegister.c
 
-LIBRARY_HOST = asHost
 LIBRARY_IOC = asIoc
 
-asHost_LIBS  = dbStaticHost ca Com
-asIoc_LIBS  = dbIoc dbStaticIoc ca Com
+asIoc_LIBS  = dbIoc dbStaticIoc Com
 
-asHost_RCS = asHost.rc
 asIoc_RCS = asIoc.rc
 
 PROD_HOST = ascheck
 ascheck_SRCS = ascheck.c
-PROD_LIBS = asHost dbStaticHost ca Com
+PROD_LIBS = asHost dbStaticHost Com
 
 include $(TOP)/configure/RULES
-
-# Extra rule since asLib_lex.c is included by asLib.c
-asLib$(OBJ): asLib_lex.c
-
-clean::
-	@$(RM) asLib.c asLib_lex.c
-

src/libCom/Makefile

@@ -294,7 +294,7 @@ PROD_SYS_LIBS_WIN32 = ws2_32 advapi32
 #	for bldErrSymTbl:
 #
 ERR_S_FILES += $(TOP)/src/libCom/osi/devLib.h
-ERR_S_FILES += $(TOP)/src/ioc/as/asLib.h
+ERR_S_FILES += $(TOP)/src/libCom/as/asLib.h
 ERR_S_FILES += $(TOP)/src/ioc/db/dbAccessDefs.h
 ERR_S_FILES += $(TOP)/src/ioc/dbStatic/devSup.h
 ERR_S_FILES += $(TOP)/src/ioc/dbStatic/drvSup.h

src/libCom/as/Makefile

@@ -0,0 +1,32 @@
+#*************************************************************************
+# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
+#     Brookhaven National Lab.
+# Copyright (c) 2007 UChicago Argonne LLC, 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
+
+INC += asLib.h
+INC += asTrapWrite.h
+
+LIB_SRCS += asLib.c
+LIB_SRCS += asTrapWrite.c
+
+LIBRARY_HOST = asHost
+
+asHost_LIBS  = Com
+
+asHost_RCS = asHost.rc
+
+include $(TOP)/configure/RULES
+
+# Extra rule since asLib_lex.c is included by asLib.c
+asLib$(OBJ): asLib_lex.c
+
+clean::
+	@$(RM) asLib.c asLib_lex.c