diff --git a/src/libCom/Makefile b/src/libCom/Makefile index 87ed4ff01..ec1c86a1c 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -1,5 +1,5 @@ #************************************************************************* -# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne +# Copyright (c) 2010 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. @@ -9,334 +9,43 @@ TOP = ../.. include $(TOP)/configure/CONFIG -LIBCOM = $(TOP)/src/libCom +SRC = $(TOP)/src +LIBCOM = $(SRC)/libCom -# Command-line input support -epicsReadline_CFLAGS += -DEPICS_COMMANDLINE_LIBRARY=EPICS_COMMANDLINE_LIBRARY_$(COMMANDLINE_LIBRARY) -epicsReadline_INCLUDES += $(INCLUDES_$(COMMANDLINE_LIBRARY)) +include $(LIBCOM)/bucketLib/Makefile +include $(LIBCOM)/calc/Makefile +include $(LIBCOM)/cvtFast/Makefile +include $(LIBCOM)/cppStd/Makefile +include $(LIBCOM)/cxxTemplates/Makefile +include $(LIBCOM)/dbmf/Makefile +include $(LIBCOM)/ellLib/Makefile +include $(LIBCOM)/env/Makefile +include $(LIBCOM)/error/Makefile +include $(LIBCOM)/fdmgr/Makefile +include $(LIBCOM)/freeList/Makefile +include $(LIBCOM)/gpHash/Makefile +include $(LIBCOM)/iocsh/Makefile +include $(LIBCOM)/log/Makefile +include $(LIBCOM)/macLib/Makefile +include $(LIBCOM)/misc/Makefile +include $(LIBCOM)/osi/Makefile +include $(LIBCOM)/ring/Makefile +include $(LIBCOM)/taskwd/Makefile +include $(LIBCOM)/timer/Makefile +include $(LIBCOM)/tsDefs/Makefile -#POSIX thread priority scheduling flag -THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING -osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING)) - -#epicsVersion is created by this Makefile -INC += epicsVersion.h - -SRC_DIRS += $(LIBCOM)/bucketLib -INC += bucketLib.h -SRCS += bucketLib.c - -SRC_DIRS += $(LIBCOM)/ring -#following needed for locating epicsRingPointer.h and epicsRingBytes.h -INC += epicsRingPointer.h -INC += epicsRingBytes.h -SRCS += epicsRingPointer.cpp -SRCS += epicsRingBytes.c - -SRC_DIRS += $(LIBCOM)/calc -INC += postfix.h -SRCS += postfix.c -SRCS += calcPerform.c - -SRC_DIRS += $(LIBCOM)/cvtFast -INC += cvtFast.h -SRCS += cvtFast.c - -# From cppStd -SRC_DIRS += $(LIBCOM)/cppStd -INC += epicsAlgorithm.h -INC += epicsExcept.h -INC += epicsMemory.h - -# From cxxTemplates -SRC_DIRS += $(LIBCOM)/cxxTemplates -INC += resourceLib.h -INC += tsDLList.h -INC += tsSLList.h -INC += tsMinMax.h -INC += tsBTree.h -INC += tsFreeList.h -INC += epicsSingleton.h -INC += epicsGuard.h -INC += epicsOnce.h -SRCS += resourceLib.cpp -SRCS += epicsOnce.cpp -SRCS += epicsSingletonMutex.cpp - -SRC_DIRS += $(LIBCOM)/dbmf -INC += dbmf.h -SRCS += dbmf.c - -SRC_DIRS += $(LIBCOM)/ellLib -INC += ellLib.h -SRCS += ellLib.c - -SRC_DIRS += $(LIBCOM)/env -INC += envDefs.h -SRCS += envSubr.c -SRCS += envData.c - -SRC_DIRS += $(LIBCOM)/error -INC += epicsPrint.h -INC += errMdef.h -INC += errSymTbl.h -INC += errlog.h -INC += error.h -SRCS += errlog.c -SRCS += errSymLib.c -SRCS += errSymTbl.c - -SRC_DIRS += $(LIBCOM)/fdmgr -INC += fdManager.h -INC += fdmgr.h -SRCS += fdmgr.cpp -SRCS += fdManager.cpp - -SRC_DIRS += $(LIBCOM)/freeList -INC += freeList.h -SRCS += freeListLib.c -HTMLS += freeList/freeList.html - -SRC_DIRS += $(LIBCOM)/gpHash -INC += gpHash.h -SRCS += gpHashLib.c -HTMLS += gpHash/gpHash.html - -SRC_DIRS += $(LIBCOM)/iocsh -INC += iocsh.h -INC += registry.h -INC += libComRegister.h -SRCS += iocsh.cpp -SRCS += registry.c -SRCS += libComRegister.c - -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 -SRCS += macEnv.c -SRCS += macUtil.c - -SRC_DIRS += $(LIBCOM)/misc -INC += alarm.h -INC += alarmString.h -INC += adjustment.h -INC += cantProceed.h -INC += dbDefs.h -INC += epicsConvert.h -INC += epicsExit.h -INC += epicsStdlib.h -INC += epicsString.h -INC += epicsTypes.h -INC += shareLib.h -INC += epicsExport.h -INC += unixFileName.h -INC += locationException.h -INC += ipAddrToAsciiAsynchronous.h -INC += compilerDependencies.h -INC += epicsUnitTest.h -INC += testMain.h -SRCS += aToIPAddr.c -SRCS += adjustment.c -SRCS += cantProceed.c -SRCS += epicsConvert.c -SRCS += epicsExit.c -SRCS += epicsStdlib.c -SRCS += epicsString.c -SRCS += truncateFile.c -SRCS += ipAddrToAsciiAsynchronous.cpp -SRCS += epicsUnitTest.c - -# From osi -SRC_DIRS += $(LIBCOM)/osi -INC += osiFileName.h -INC += osiSock.h -INC += osdSock.h -INC += epicsInterrupt.h -INC += osdInterrupt.h - -INC += epicsMutex.h -INC += osdMutex.h -INC += epicsEvent.h -INC += osdEvent.h -INC += epicsMath.h -INC += osdMessageQueue.h -INC += osdStrtod.h - -INC += epicsAssert.h -INC += epicsFindSymbol.h -INC += osiPoolStatus.h -INC += osdPoolStatus.h -INC += osdThread.h - -INC += epicsThread.h -INC += epicsTime.h -INC += epicsGeneralTime.h -INC += osdTime.h -INC += generalTimeSup.h -INC += osiClockTime.h -INC += epicsSignal.h -INC += osiProcess.h -INC += osiUnistd.h -INC += osiWireFormat.h -INC += osdWireFormat.h -INC += osdWireConfig.h -INC += epicsEndian.h -INC += epicsReadline.h -INC += epicsMessageQueue.h -INC += epicsStdio.h -INC += epicsStdioRedirect.h -INC += epicsGetopt.h - -INC += devLib.h -INC += devLibVME.h -INC += devLibVMEImpl.h -INC += osdVME.h - -SRCS += epicsThread.cpp -SRCS += epicsMutex.cpp -SRCS += epicsEvent.cpp -SRCS += epicsTime.cpp -SRCS += epicsMessageQueue.cpp -SRCS += epicsMath.cpp - -SRCS += epicsGeneralTime.c -SRCS += osiClockTime.c - -SRCS += osdSock.c -SRCS += osdSockAddrReuse.cpp -SRCS += osiSock.c -SRCS += systemCallIntMech.cpp -SRCS += epicsSocketConvertErrnoToString.cpp -SRCS += osdAssert.c -SRCS += osdFindSymbol.c -SRCS += osdInterrupt.c -SRCS += osdPoolStatus.c -SRCS += osdSignal.cpp -SRCS += osdEnv.c -SRCS += epicsReadline.c -SRCS += epicsTempFile.cpp -SRCS += epicsStdio.c -SRCS += osdStdio.c - -osdEnv_CFLAGS_WIN32= -U__STDC__ - -SRCS += osdThread.c -SRCS += osdMutex.c -SRCS += osdEvent.c -SRCS += osdTime.cpp -SRCS += osdProcess.c -SRCS += osdNetIntf.c -SRCS += osdMessageQueue.c - -SRCS += devLibVME.c -SRCS += devLibVMEOSD.c - -SRC_DIRS += $(LIBCOM)/taskwd -INC += taskwd.h -SRCS += taskwd.c - -SRC_DIRS += $(LIBCOM)/timer -INC += epicsTimer.h -SRCS += epicsTimer.cpp -SRCS += timer.cpp -SRCS += timerQueue.cpp -SRCS += timerQueueActive.cpp -SRCS += timerQueueActiveMgr.cpp -SRCS += timerQueuePassive.cpp - -#tsDefs contains R3.13 compatibility tsStamp code -SRC_DIRS += $(LIBCOM)/tsDefs -INC += tsDefs.h -SRCS += tsDefs.c - -# Time providers, in osi -SRCS_vxWorks += osiNTPTime.c -SRCS_RTEMS += osiNTPTime.c - -# These files are in osi/os/vxWorks -# Special reboot hook -SRCS_vxWorks += atReboot.cpp -# For old vxWorks applications -INC_vxWorks += camacLib.h -INC_vxWorks += epicsDynLink.h -INC_vxWorks += module_types.h -INC_vxWorks += task_params.h -SRCS_vxWorks += epicsDynLink.c -SRCS_vxWorks += veclist.c -SRCS_vxWorks += logMsgToErrlog.cpp - -#This forces the vxWorks compatibility stuff to be loaded -OBJS_vxWorks = vxComLibrary - -# These files are in osi/os/WIN32 -SRCS_WIN32 += epicsGetopt.c -SRCS_WIN32 += setThreadName.cpp -#SRCS_WIN32 += dllmain.cpp -SRCS_WIN32 += forceBadAllocException.cpp - -# Library to build: -# lib$(LIBRARY).a or ..dll/..exp/..lib -# +# Library to build: LIBRARY=Com Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32 Com_RCS = Com.rc -# libs needed for PROD and TESTPRODUCT -PROD_LIBS = Com -PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 - -# for bldErrSymTbl: -# -ERR_S_FILES += $(TOP)/src/libCom/osi/devLib.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 -ERR_S_FILES += $(TOP)/src/ioc/dbStatic/recSup.h -ERR_S_FILES += $(TOP)/src/ioc/dbStatic/dbStaticLib.h -ERR_S_FILES += $(LIBCOM)/error/errMdef.h -ERR_S_FILES += $(TOP)/src/ca/legacy/pcas/generic/casdef.h -ERR_S_FILES += $(TOP)/src/ca/legacy/gdd/gddAppFuncTable.h - include $(TOP)/configure/RULES -osdAssert$(OBJ): $(COMMON_DIR)/epicsVersion.h -epicsTime$(OBJ): $(COMMON_DIR)/epicsVersion.h -osdNetIntf$(OBJ): $(COMMON_DIR)/epicsVersion.h -osdSock$(OBJ): $(COMMON_DIR)/epicsVersion.h - -envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \ - $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV - $(PERL) $(LIBCOM)/env/bldEnvData.pl $(CONFIG) - -errSymTbl.c: $(ERR_S_FILES) $(LIBCOM)/error/makeStatTbl.pl - $(PERL) $(LIBCOM)/error/makeStatTbl.pl $(ERR_S_FILES) - -$(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 +include $(LIBCOM)/env/RULES +include $(LIBCOM)/error/RULES +include $(LIBCOM)/log/RULES +include $(LIBCOM)/misc/RULES +include $(LIBCOM)/osi/RULES diff --git a/src/libCom/bucketLib/Makefile b/src/libCom/bucketLib/Makefile new file mode 100644 index 000000000..a2fc1bf87 --- /dev/null +++ b/src/libCom/bucketLib/Makefile @@ -0,0 +1,12 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/bucketLib +INC += bucketLib.h +SRCS += bucketLib.c diff --git a/src/libCom/calc/Makefile b/src/libCom/calc/Makefile new file mode 100644 index 000000000..9c72dc9d7 --- /dev/null +++ b/src/libCom/calc/Makefile @@ -0,0 +1,14 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/calc +INC += postfix.h +SRCS += postfix.c +SRCS += calcPerform.c + diff --git a/src/libCom/cppStd/Makefile b/src/libCom/cppStd/Makefile new file mode 100644 index 000000000..989b87eb0 --- /dev/null +++ b/src/libCom/cppStd/Makefile @@ -0,0 +1,14 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/cppStd +INC += epicsAlgorithm.h +INC += epicsExcept.h +INC += epicsMemory.h + diff --git a/src/libCom/cvtFast/Makefile b/src/libCom/cvtFast/Makefile new file mode 100644 index 000000000..5f85ac305 --- /dev/null +++ b/src/libCom/cvtFast/Makefile @@ -0,0 +1,13 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/cvtFast +INC += cvtFast.h +SRCS += cvtFast.c + diff --git a/src/libCom/cxxTemplates/Makefile b/src/libCom/cxxTemplates/Makefile new file mode 100644 index 000000000..519f01fc3 --- /dev/null +++ b/src/libCom/cxxTemplates/Makefile @@ -0,0 +1,23 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/cxxTemplates +INC += resourceLib.h +INC += tsDLList.h +INC += tsSLList.h +INC += tsMinMax.h +INC += tsBTree.h +INC += tsFreeList.h +INC += epicsSingleton.h +INC += epicsGuard.h +INC += epicsOnce.h +SRCS += resourceLib.cpp +SRCS += epicsOnce.cpp +SRCS += epicsSingletonMutex.cpp + diff --git a/src/libCom/dbmf/Makefile b/src/libCom/dbmf/Makefile new file mode 100644 index 000000000..fb21b7795 --- /dev/null +++ b/src/libCom/dbmf/Makefile @@ -0,0 +1,13 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/dbmf +INC += dbmf.h +SRCS += dbmf.c + diff --git a/src/libCom/ellLib/Makefile b/src/libCom/ellLib/Makefile new file mode 100644 index 000000000..b32420f3f --- /dev/null +++ b/src/libCom/ellLib/Makefile @@ -0,0 +1,12 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/ellLib +INC += ellLib.h +SRCS += ellLib.c diff --git a/src/libCom/env/Makefile b/src/libCom/env/Makefile new file mode 100644 index 000000000..09472017e --- /dev/null +++ b/src/libCom/env/Makefile @@ -0,0 +1,16 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/env + +INC += envDefs.h + +SRCS += envSubr.c +SRCS += envData.c + diff --git a/src/libCom/env/RULES b/src/libCom/env/RULES new file mode 100644 index 000000000..68804e05f --- /dev/null +++ b/src/libCom/env/RULES @@ -0,0 +1,15 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \ + $(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV + $(PERL) $(LIBCOM)/env/bldEnvData.pl $(CONFIG) + +clean:: + @$(RM) envData.c diff --git a/src/libCom/error/Makefile b/src/libCom/error/Makefile new file mode 100644 index 000000000..236d531d4 --- /dev/null +++ b/src/libCom/error/Makefile @@ -0,0 +1,34 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/error + +INC += epicsPrint.h +INC += errMdef.h +INC += errSymTbl.h +INC += errlog.h +INC += error.h + +SRCS += errlog.c +SRCS += errSymLib.c +SRCS += errSymTbl.c + +# For bldErrSymTbl +# +ERR_S_FILES += $(LIBCOM)/osi/devLib.h +ERR_S_FILES += $(LIBCOM)/as/asLib.h +ERR_S_FILES += $(SRC)/ioc/db/dbAccessDefs.h +ERR_S_FILES += $(SRC)/ioc/dbStatic/devSup.h +ERR_S_FILES += $(SRC)/ioc/dbStatic/drvSup.h +ERR_S_FILES += $(SRC)/ioc/dbStatic/recSup.h +ERR_S_FILES += $(SRC)/ioc/dbStatic/dbStaticLib.h +ERR_S_FILES += $(LIBCOM)/error/errMdef.h +ERR_S_FILES += $(SRC)/ca/legacy/pcas/generic/casdef.h +ERR_S_FILES += $(SRC)/ca/legacy/gdd/gddAppFuncTable.h + diff --git a/src/libCom/error/RULES b/src/libCom/error/RULES new file mode 100644 index 000000000..7d26e8659 --- /dev/null +++ b/src/libCom/error/RULES @@ -0,0 +1,14 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +errSymTbl.c: $(ERR_S_FILES) $(LIBCOM)/error/makeStatTbl.pl + $(PERL) $(LIBCOM)/error/makeStatTbl.pl $(ERR_S_FILES) + +clean:: + @$(RM) errSymTbl.c diff --git a/src/libCom/fdmgr/Makefile b/src/libCom/fdmgr/Makefile new file mode 100644 index 000000000..97d894ac4 --- /dev/null +++ b/src/libCom/fdmgr/Makefile @@ -0,0 +1,14 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/fdmgr +INC += fdManager.h +INC += fdmgr.h +SRCS += fdmgr.cpp +SRCS += fdManager.cpp diff --git a/src/libCom/freeList/Makefile b/src/libCom/freeList/Makefile new file mode 100644 index 000000000..176c408a7 --- /dev/null +++ b/src/libCom/freeList/Makefile @@ -0,0 +1,13 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/freeList +INC += freeList.h +SRCS += freeListLib.c +HTMLS += freeList/freeList.html diff --git a/src/libCom/gpHash/Makefile b/src/libCom/gpHash/Makefile new file mode 100644 index 000000000..c9567ba4e --- /dev/null +++ b/src/libCom/gpHash/Makefile @@ -0,0 +1,13 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/gpHash +INC += gpHash.h +SRCS += gpHashLib.c +HTMLS += gpHash/gpHash.html diff --git a/src/libCom/iocsh/Makefile b/src/libCom/iocsh/Makefile new file mode 100644 index 000000000..ca96eaac3 --- /dev/null +++ b/src/libCom/iocsh/Makefile @@ -0,0 +1,16 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/iocsh +INC += iocsh.h +INC += registry.h +INC += libComRegister.h +SRCS += iocsh.cpp +SRCS += registry.c +SRCS += libComRegister.c diff --git a/src/libCom/log/Makefile b/src/libCom/log/Makefile new file mode 100644 index 000000000..c8e209785 --- /dev/null +++ b/src/libCom/log/Makefile @@ -0,0 +1,26 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/log +INC += iocLog.h +INC += logClient.h +SRCS += iocLog.c +SRCS += logClient.c + +PROD_HOST += iocLogServer + +iocLogServer_SRCS = iocLogServer.c +iocLogServer_LIBS = Com + +iocLogServer_SYS_LIBS_solaris += socket +iocLogServer_SYS_LIBS_WIN32 += user32 + +SCRIPTS_solaris := S99logServer +SCRIPTS_Linux := S99logServer + diff --git a/src/libCom/log/RULES b/src/libCom/log/RULES new file mode 100644 index 000000000..0483b0518 --- /dev/null +++ b/src/libCom/log/RULES @@ -0,0 +1,12 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +S99%: ../log/rc2.% + sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@ + diff --git a/src/libCom/macLib/Makefile b/src/libCom/macLib/Makefile new file mode 100644 index 000000000..bc8a33cd3 --- /dev/null +++ b/src/libCom/macLib/Makefile @@ -0,0 +1,14 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/macLib +INC += macLib.h +SRCS += macCore.c +SRCS += macEnv.c +SRCS += macUtil.c diff --git a/src/libCom/misc/Makefile b/src/libCom/misc/Makefile new file mode 100644 index 000000000..cf67e1146 --- /dev/null +++ b/src/libCom/misc/Makefile @@ -0,0 +1,43 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/misc + +INC += alarm.h +INC += alarmString.h +INC += adjustment.h +INC += cantProceed.h +INC += dbDefs.h +INC += epicsConvert.h +INC += epicsExit.h +INC += epicsStdlib.h +INC += epicsString.h +INC += epicsTypes.h +INC += shareLib.h +INC += epicsExport.h +INC += unixFileName.h +INC += locationException.h +INC += ipAddrToAsciiAsynchronous.h +INC += compilerDependencies.h +INC += epicsUnitTest.h +INC += testMain.h + +# epicsVersion.h is created by this Makefile +INC += epicsVersion.h + +SRCS += aToIPAddr.c +SRCS += adjustment.c +SRCS += cantProceed.c +SRCS += epicsConvert.c +SRCS += epicsExit.c +SRCS += epicsStdlib.c +SRCS += epicsString.c +SRCS += truncateFile.c +SRCS += ipAddrToAsciiAsynchronous.cpp +SRCS += epicsUnitTest.c diff --git a/src/libCom/misc/RULES b/src/libCom/misc/RULES new file mode 100644 index 000000000..fe180a83f --- /dev/null +++ b/src/libCom/misc/RULES @@ -0,0 +1,12 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +$(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SITE + $(PERL) $(LIBCOM)/misc/makeEpicsVersion.pl $(CONFIG)/CONFIG_BASE_VERSION $(@D) $(EPICS_SITE_VERSION) + diff --git a/src/libCom/osi/Makefile b/src/libCom/osi/Makefile new file mode 100644 index 000000000..a8311fa6f --- /dev/null +++ b/src/libCom/osi/Makefile @@ -0,0 +1,127 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/osi +INC += osiFileName.h +INC += osiSock.h +INC += osdSock.h +INC += epicsInterrupt.h +INC += osdInterrupt.h + +INC += epicsMutex.h +INC += osdMutex.h +INC += epicsEvent.h +INC += osdEvent.h +INC += epicsMath.h +INC += osdMessageQueue.h +INC += osdStrtod.h + +INC += epicsAssert.h +INC += epicsFindSymbol.h +INC += osiPoolStatus.h +INC += osdPoolStatus.h +INC += osdThread.h + +INC += epicsThread.h +INC += epicsTime.h +INC += epicsGeneralTime.h +INC += osdTime.h +INC += generalTimeSup.h +INC += osiClockTime.h +INC += epicsSignal.h +INC += osiProcess.h +INC += osiUnistd.h +INC += osiWireFormat.h +INC += osdWireFormat.h +INC += osdWireConfig.h +INC += epicsEndian.h +INC += epicsReadline.h +INC += epicsMessageQueue.h +INC += epicsStdio.h +INC += epicsStdioRedirect.h +INC += epicsGetopt.h + +INC += devLib.h +INC += devLibVME.h +INC += devLibVMEImpl.h +INC += osdVME.h + +SRCS += epicsThread.cpp +SRCS += epicsMutex.cpp +SRCS += epicsEvent.cpp +SRCS += epicsTime.cpp +SRCS += epicsMessageQueue.cpp +SRCS += epicsMath.cpp + +SRCS += epicsGeneralTime.c + +# Time providers +SRCS += osiClockTime.c +SRCS_vxWorks += osiNTPTime.c +SRCS_RTEMS += osiNTPTime.c + +SRCS += osdSock.c +SRCS += osdSockAddrReuse.cpp +SRCS += osiSock.c +SRCS += systemCallIntMech.cpp +SRCS += epicsSocketConvertErrnoToString.cpp +SRCS += osdAssert.c +SRCS += osdFindSymbol.c +SRCS += osdInterrupt.c +SRCS += osdPoolStatus.c +SRCS += osdSignal.cpp + +osdEnv_CFLAGS_WIN32= -U__STDC__ + +SRCS += osdEnv.c + +# Command-line input support +epicsReadline_CFLAGS += -DEPICS_COMMANDLINE_LIBRARY=EPICS_COMMANDLINE_LIBRARY_$(COMMANDLINE_LIBRARY) +epicsReadline_INCLUDES += $(INCLUDES_$(COMMANDLINE_LIBRARY)) + +SRCS += epicsReadline.c + +SRCS += epicsTempFile.cpp +SRCS += epicsStdio.c +SRCS += osdStdio.c + +#POSIX thread priority scheduling flag +THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING +osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING)) + +SRCS += osdThread.c +SRCS += osdMutex.c +SRCS += osdEvent.c +SRCS += osdTime.cpp +SRCS += osdProcess.c +SRCS += osdNetIntf.c +SRCS += osdMessageQueue.c + +SRCS += devLibVME.c +SRCS += devLibVMEOSD.c + +SRCS_vxWorks += atReboot.cpp + +# For old vxWorks applications +INC_vxWorks += camacLib.h +INC_vxWorks += epicsDynLink.h +INC_vxWorks += module_types.h +INC_vxWorks += task_params.h + +SRCS_vxWorks += epicsDynLink.c +SRCS_vxWorks += veclist.c +SRCS_vxWorks += logMsgToErrlog.cpp + +#This forces the vxWorks compatibility stuff to be loaded +OBJS_vxWorks = vxComLibrary + +SRCS_WIN32 += epicsGetopt.c +SRCS_WIN32 += setThreadName.cpp +#SRCS_WIN32 += dllmain.cpp +SRCS_WIN32 += forceBadAllocException.cpp diff --git a/src/libCom/osi/RULES b/src/libCom/osi/RULES new file mode 100644 index 000000000..d23033c3f --- /dev/null +++ b/src/libCom/osi/RULES @@ -0,0 +1,15 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +# Ensure epicsVersion.h gets built first +osdAssert$(OBJ): $(COMMON_DIR)/epicsVersion.h +epicsTime$(OBJ): $(COMMON_DIR)/epicsVersion.h +osdNetIntf$(OBJ): $(COMMON_DIR)/epicsVersion.h +osdSock$(OBJ): $(COMMON_DIR)/epicsVersion.h + diff --git a/src/libCom/ring/Makefile b/src/libCom/ring/Makefile new file mode 100644 index 000000000..6c2e69575 --- /dev/null +++ b/src/libCom/ring/Makefile @@ -0,0 +1,15 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/ring +#following needed for locating epicsRingPointer.h and epicsRingBytes.h +INC += epicsRingPointer.h +INC += epicsRingBytes.h +SRCS += epicsRingPointer.cpp +SRCS += epicsRingBytes.c diff --git a/src/libCom/taskwd/Makefile b/src/libCom/taskwd/Makefile new file mode 100644 index 000000000..2562fb13e --- /dev/null +++ b/src/libCom/taskwd/Makefile @@ -0,0 +1,12 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/taskwd +INC += taskwd.h +SRCS += taskwd.c diff --git a/src/libCom/timer/Makefile b/src/libCom/timer/Makefile new file mode 100644 index 000000000..ffd5af816 --- /dev/null +++ b/src/libCom/timer/Makefile @@ -0,0 +1,17 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/timer +INC += epicsTimer.h +SRCS += epicsTimer.cpp +SRCS += timer.cpp +SRCS += timerQueue.cpp +SRCS += timerQueueActive.cpp +SRCS += timerQueueActiveMgr.cpp +SRCS += timerQueuePassive.cpp diff --git a/src/libCom/tsDefs/Makefile b/src/libCom/tsDefs/Makefile new file mode 100644 index 000000000..e2d5c65be --- /dev/null +++ b/src/libCom/tsDefs/Makefile @@ -0,0 +1,13 @@ +#************************************************************************* +# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne +# National Laboratory. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +#tsDefs contains R3.13 compatibility tsStamp code +SRC_DIRS += $(LIBCOM)/tsDefs +INC += tsDefs.h +SRCS += tsDefs.c