From f7fc56455697a3bef93095ca2ccd9a2a5de08e29 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Fri, 25 Feb 2011 15:39:44 -0600 Subject: [PATCH] Fold antelope/flex and asHost into libCom Build lexer and parser from libCom/Makefile. Since libCom now includes asLib.c and asLib_lex.c we must build antelope and flex without linking them to Com. This works because they only need epicsTempFile anyway. However make doesn't like a subdirectory with the same name as a target object, so the antelope source directory is now called yacc. The two main.c files were also renamed to avoid other build problems. Merge asHost into Com and remove mentions in CONFIG_BASE Lots of noise since SRCS must be renamed to Com_SRCS --- configure/CONFIG_BASE | 4 +- src/Makefile | 10 +-- src/ioc/as/Makefile | 2 +- src/libCom/Makefile | 3 + src/libCom/as/Makefile | 21 ++--- src/libCom/as/RULES | 22 +++++ src/libCom/as/asHost.rc | 36 -------- src/libCom/bucketLib/Makefile | 2 +- src/libCom/calc/Makefile | 4 +- src/libCom/cvtFast/Makefile | 2 +- src/libCom/cxxTemplates/Makefile | 6 +- src/libCom/dbmf/Makefile | 2 +- src/libCom/ellLib/Makefile | 2 +- src/libCom/env/Makefile | 4 +- src/libCom/error/Makefile | 6 +- src/libCom/fdmgr/Makefile | 4 +- src/libCom/{tools => }/flex/COPYING | 0 src/libCom/{tools => }/flex/Changes | 0 src/libCom/{tools => }/flex/EPICS_READ_THIS | 0 src/libCom/{tools => }/flex/Flex.doc | 0 src/libCom/flex/Makefile | 35 ++++++++ src/libCom/{tools => }/flex/README | 0 src/libCom/{tools/Makefile => flex/RULES} | 15 ++-- src/libCom/{tools => }/flex/ccl.c | 0 src/libCom/{tools => }/flex/dfa.c | 0 src/libCom/{tools => }/flex/ecs.c | 0 src/libCom/{tools/flex/main.c => flex/flex.c} | 0 src/libCom/{tools => }/flex/flex.html | 0 src/libCom/{tools => }/flex/flex.skel | 0 src/libCom/{tools => }/flex/flex.skel.static | 0 src/libCom/{tools => }/flex/flexdef.h | 0 src/libCom/{tools => }/flex/flexdoc.html | 0 src/libCom/{tools => }/flex/gen.c | 0 src/libCom/{tools => }/flex/libmain.c | 0 src/libCom/{tools => }/flex/misc.c | 0 src/libCom/{tools => }/flex/nfa.c | 0 src/libCom/{tools => }/flex/parse.y | 2 +- src/libCom/{tools => }/flex/scan.c | 0 src/libCom/{tools => }/flex/scan.l.DISTRIB | 0 src/libCom/{tools => }/flex/sym.c | 0 src/libCom/{tools => }/flex/tblcmp.c | 0 src/libCom/{tools => }/flex/yylex.c | 0 src/libCom/freeList/Makefile | 2 +- src/libCom/gpHash/Makefile | 2 +- src/libCom/iocsh/Makefile | 6 +- src/libCom/log/Makefile | 4 +- src/libCom/macLib/Makefile | 6 +- src/libCom/misc/Makefile | 20 ++--- src/libCom/osi/Makefile | 84 +++++++++---------- src/libCom/ring/Makefile | 4 +- src/libCom/taskwd/Makefile | 2 +- src/libCom/timer/Makefile | 12 +-- src/libCom/tools/flex/Makefile | 44 ---------- src/libCom/tsDefs/Makefile | 2 +- .../{tools/antelope => yacc}/ACKNOWLEDGEMENTS | 0 .../{tools/antelope => yacc}/EPICS_READ_THIS | 0 src/libCom/{tools/antelope => yacc}/Makefile | 34 ++++---- .../{tools/antelope => yacc}/NEW_FEATURES | 0 src/libCom/{tools/antelope => yacc}/NOTES | 0 .../{tools/antelope => yacc}/NO_WARRANTY | 0 src/libCom/{tools/antelope => yacc}/README | 0 .../antelope/main.c => yacc/antelope.c} | 0 src/libCom/{tools/antelope => yacc}/closure.c | 0 src/libCom/{tools/antelope => yacc}/defs.h | 0 src/libCom/{tools/antelope => yacc}/error.c | 0 src/libCom/{tools/antelope => yacc}/lalr.c | 0 src/libCom/{tools/antelope => yacc}/lr0.c | 0 src/libCom/{tools/antelope => yacc}/mkpar.c | 0 src/libCom/{tools/antelope => yacc}/output.c | 0 src/libCom/{tools/antelope => yacc}/reader.c | 0 .../{tools/antelope => yacc}/skeleton.c | 0 src/libCom/{tools/antelope => yacc}/symtab.c | 0 src/libCom/{tools/antelope => yacc}/verbose.c | 0 .../{tools/antelope => yacc}/warshall.c | 0 src/libCom/{tools/antelope => yacc}/yacc.html | 0 75 files changed, 182 insertions(+), 222 deletions(-) create mode 100644 src/libCom/as/RULES delete mode 100755 src/libCom/as/asHost.rc rename src/libCom/{tools => }/flex/COPYING (100%) rename src/libCom/{tools => }/flex/Changes (100%) rename src/libCom/{tools => }/flex/EPICS_READ_THIS (100%) rename src/libCom/{tools => }/flex/Flex.doc (100%) create mode 100644 src/libCom/flex/Makefile rename src/libCom/{tools => }/flex/README (100%) rename src/libCom/{tools/Makefile => flex/RULES} (62%) rename src/libCom/{tools => }/flex/ccl.c (100%) rename src/libCom/{tools => }/flex/dfa.c (100%) rename src/libCom/{tools => }/flex/ecs.c (100%) rename src/libCom/{tools/flex/main.c => flex/flex.c} (100%) rename src/libCom/{tools => }/flex/flex.html (100%) rename src/libCom/{tools => }/flex/flex.skel (100%) rename src/libCom/{tools => }/flex/flex.skel.static (100%) rename src/libCom/{tools => }/flex/flexdef.h (100%) rename src/libCom/{tools => }/flex/flexdoc.html (100%) rename src/libCom/{tools => }/flex/gen.c (100%) rename src/libCom/{tools => }/flex/libmain.c (100%) rename src/libCom/{tools => }/flex/misc.c (100%) rename src/libCom/{tools => }/flex/nfa.c (100%) rename src/libCom/{tools => }/flex/parse.y (99%) rename src/libCom/{tools => }/flex/scan.c (100%) rename src/libCom/{tools => }/flex/scan.l.DISTRIB (100%) rename src/libCom/{tools => }/flex/sym.c (100%) rename src/libCom/{tools => }/flex/tblcmp.c (100%) rename src/libCom/{tools => }/flex/yylex.c (100%) delete mode 100644 src/libCom/tools/flex/Makefile rename src/libCom/{tools/antelope => yacc}/ACKNOWLEDGEMENTS (100%) rename src/libCom/{tools/antelope => yacc}/EPICS_READ_THIS (100%) rename src/libCom/{tools/antelope => yacc}/Makefile (52%) rename src/libCom/{tools/antelope => yacc}/NEW_FEATURES (100%) rename src/libCom/{tools/antelope => yacc}/NOTES (100%) rename src/libCom/{tools/antelope => yacc}/NO_WARRANTY (100%) rename src/libCom/{tools/antelope => yacc}/README (100%) rename src/libCom/{tools/antelope/main.c => yacc/antelope.c} (100%) rename src/libCom/{tools/antelope => yacc}/closure.c (100%) rename src/libCom/{tools/antelope => yacc}/defs.h (100%) rename src/libCom/{tools/antelope => yacc}/error.c (100%) rename src/libCom/{tools/antelope => yacc}/lalr.c (100%) rename src/libCom/{tools/antelope => yacc}/lr0.c (100%) rename src/libCom/{tools/antelope => yacc}/mkpar.c (100%) rename src/libCom/{tools/antelope => yacc}/output.c (100%) rename src/libCom/{tools/antelope => yacc}/reader.c (100%) rename src/libCom/{tools/antelope => yacc}/skeleton.c (100%) rename src/libCom/{tools/antelope => yacc}/symtab.c (100%) rename src/libCom/{tools/antelope => yacc}/verbose.c (100%) rename src/libCom/{tools/antelope => yacc}/warshall.c (100%) rename src/libCom/{tools/antelope => yacc}/yacc.html (100%) diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE index 8817cc052..60e0525b4 100644 --- a/configure/CONFIG_BASE +++ b/configure/CONFIG_BASE @@ -22,13 +22,13 @@ endif # Epics base Ioc libraries EPICS_BASE_IOC_LIBS += recIoc softDevIoc -EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc asHost +EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com #--------------------------------------------------------------- # Epics base Host libraries -EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost registryIoc +EPICS_BASE_HOST_LIBS += cas gdd dbStaticHost registryIoc EPICS_BASE_HOST_LIBS += ca Com #--------------------------------------------------------------- diff --git a/src/Makefile b/src/Makefile index 3dd3473de..5260b2b92 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,12 +26,6 @@ template/ext_DEPEND_DIRS = tools DIRS += libCom libCom_DEPEND_DIRS = tools -DIRS += libCom/tools -libCom/tools_DEPEND_DIRS = libCom - -DIRS += libCom/as -libCom/as_DEPEND_DIRS = libCom libCom/tools - DIRS += libCom/RTEMS libCom/RTEMS_DEPEND_DIRS = libCom @@ -61,7 +55,7 @@ ca/client/perl_DEPEND_DIRS = ca/client # PDB Core DIRS += ioc/dbStatic -ioc/dbStatic_DEPEND_DIRS = libCom/tools +ioc/dbStatic_DEPEND_DIRS = libCom DIRS += ioc/registry ioc/registry_DEPEND_DIRS = ioc/dbStatic @@ -73,7 +67,7 @@ DIRS += ioc/db ioc/db_DEPEND_DIRS = ioc/bpt ca/client DIRS += ioc/as -ioc/as_DEPEND_DIRS = ioc/db libCom/as +ioc/as_DEPEND_DIRS = ioc/db libCom DIRS += ioc/dbtemplate ioc/dbtemplate_DEPEND_DIRS = ioc/db diff --git a/src/ioc/as/Makefile b/src/ioc/as/Makefile index c43952d42..038b673c2 100644 --- a/src/ioc/as/Makefile +++ b/src/ioc/as/Makefile @@ -25,6 +25,6 @@ asIoc_RCS = asIoc.rc PROD_HOST = ascheck ascheck_SRCS = ascheck.c -PROD_LIBS = asHost dbStaticHost Com +PROD_LIBS = dbStaticHost Com include $(TOP)/configure/RULES diff --git a/src/libCom/Makefile b/src/libCom/Makefile index ec1c86a1c..d7835deea 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -12,6 +12,7 @@ include $(TOP)/configure/CONFIG SRC = $(TOP)/src LIBCOM = $(SRC)/libCom +include $(LIBCOM)/as/Makefile include $(LIBCOM)/bucketLib/Makefile include $(LIBCOM)/calc/Makefile include $(LIBCOM)/cvtFast/Makefile @@ -22,6 +23,7 @@ include $(LIBCOM)/ellLib/Makefile include $(LIBCOM)/env/Makefile include $(LIBCOM)/error/Makefile include $(LIBCOM)/fdmgr/Makefile +include $(LIBCOM)/flex/Makefile include $(LIBCOM)/freeList/Makefile include $(LIBCOM)/gpHash/Makefile include $(LIBCOM)/iocsh/Makefile @@ -33,6 +35,7 @@ include $(LIBCOM)/ring/Makefile include $(LIBCOM)/taskwd/Makefile include $(LIBCOM)/timer/Makefile include $(LIBCOM)/tsDefs/Makefile +include $(LIBCOM)/yacc/Makefile # Library to build: LIBRARY=Com diff --git a/src/libCom/as/Makefile b/src/libCom/as/Makefile index 77b355d08..898bc8b1e 100644 --- a/src/libCom/as/Makefile +++ b/src/libCom/as/Makefile @@ -1,15 +1,17 @@ #************************************************************************* # Copyright (c) 2010 Brookhaven Science Associates, as Operator of # Brookhaven National Lab. -# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne +# Copyright (c) 2011 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 + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/as INC += asLib.h INC += asTrapWrite.h @@ -17,16 +19,3 @@ 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 diff --git a/src/libCom/as/RULES b/src/libCom/as/RULES new file mode 100644 index 000000000..5b47b7604 --- /dev/null +++ b/src/libCom/as/RULES @@ -0,0 +1,22 @@ +#************************************************************************* +# Copyright (c) 2010 Brookhaven Science Associates, as Operator of +# Brookhaven National Lab. +# Copyright (c) 2011 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. +#************************************************************************ + +# This is a Makefile fragment, see src/libCom/Makefile. + +# Extra rule since asLib_lex.c is included by asLib.c +asLib$(OBJ): asLib_lex.c + +# Ensure that lexer and parser are built before they are needed +asLib.c: $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE)) +asLib_lex.c: $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE)) + +clean:: + @$(RM) asLib.c asLib_lex.c diff --git a/src/libCom/as/asHost.rc b/src/libCom/as/asHost.rc deleted file mode 100755 index 77981517e..000000000 --- a/src/libCom/as/asHost.rc +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include "epicsVersion.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL - PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_UNKNOWN - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments","Host Access Security Library for EPICS\0" - VALUE "CompanyName", "The EPICS collaboration\0" - VALUE "FileDescription", "Host Access Security Library\0" - VALUE "FileVersion", EPICS_VERSION_STRING "\0" - VALUE "InternalName", "asHost\0" - VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0" - VALUE "OriginalFilename", "asHost.dll\0" - VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0" - VALUE "ProductVersion", EPICS_VERSION_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END diff --git a/src/libCom/bucketLib/Makefile b/src/libCom/bucketLib/Makefile index a2fc1bf87..f66dc7d47 100644 --- a/src/libCom/bucketLib/Makefile +++ b/src/libCom/bucketLib/Makefile @@ -9,4 +9,4 @@ SRC_DIRS += $(LIBCOM)/bucketLib INC += bucketLib.h -SRCS += bucketLib.c +Com_SRCS += bucketLib.c diff --git a/src/libCom/calc/Makefile b/src/libCom/calc/Makefile index 9c72dc9d7..493cb3245 100644 --- a/src/libCom/calc/Makefile +++ b/src/libCom/calc/Makefile @@ -9,6 +9,6 @@ SRC_DIRS += $(LIBCOM)/calc INC += postfix.h -SRCS += postfix.c -SRCS += calcPerform.c +Com_SRCS += postfix.c +Com_SRCS += calcPerform.c diff --git a/src/libCom/cvtFast/Makefile b/src/libCom/cvtFast/Makefile index 5f85ac305..473693c83 100644 --- a/src/libCom/cvtFast/Makefile +++ b/src/libCom/cvtFast/Makefile @@ -9,5 +9,5 @@ SRC_DIRS += $(LIBCOM)/cvtFast INC += cvtFast.h -SRCS += cvtFast.c +Com_SRCS += cvtFast.c diff --git a/src/libCom/cxxTemplates/Makefile b/src/libCom/cxxTemplates/Makefile index 519f01fc3..b15464aef 100644 --- a/src/libCom/cxxTemplates/Makefile +++ b/src/libCom/cxxTemplates/Makefile @@ -17,7 +17,7 @@ INC += tsFreeList.h INC += epicsSingleton.h INC += epicsGuard.h INC += epicsOnce.h -SRCS += resourceLib.cpp -SRCS += epicsOnce.cpp -SRCS += epicsSingletonMutex.cpp +Com_SRCS += resourceLib.cpp +Com_SRCS += epicsOnce.cpp +Com_SRCS += epicsSingletonMutex.cpp diff --git a/src/libCom/dbmf/Makefile b/src/libCom/dbmf/Makefile index fb21b7795..2a190eac6 100644 --- a/src/libCom/dbmf/Makefile +++ b/src/libCom/dbmf/Makefile @@ -9,5 +9,5 @@ SRC_DIRS += $(LIBCOM)/dbmf INC += dbmf.h -SRCS += dbmf.c +Com_SRCS += dbmf.c diff --git a/src/libCom/ellLib/Makefile b/src/libCom/ellLib/Makefile index b32420f3f..b325a453e 100644 --- a/src/libCom/ellLib/Makefile +++ b/src/libCom/ellLib/Makefile @@ -9,4 +9,4 @@ SRC_DIRS += $(LIBCOM)/ellLib INC += ellLib.h -SRCS += ellLib.c +Com_SRCS += ellLib.c diff --git a/src/libCom/env/Makefile b/src/libCom/env/Makefile index 09472017e..1f9d6812a 100644 --- a/src/libCom/env/Makefile +++ b/src/libCom/env/Makefile @@ -11,6 +11,6 @@ SRC_DIRS += $(LIBCOM)/env INC += envDefs.h -SRCS += envSubr.c -SRCS += envData.c +Com_SRCS += envSubr.c +Com_SRCS += envData.c diff --git a/src/libCom/error/Makefile b/src/libCom/error/Makefile index 236d531d4..e07e86891 100644 --- a/src/libCom/error/Makefile +++ b/src/libCom/error/Makefile @@ -15,9 +15,9 @@ INC += errSymTbl.h INC += errlog.h INC += error.h -SRCS += errlog.c -SRCS += errSymLib.c -SRCS += errSymTbl.c +Com_SRCS += errlog.c +Com_SRCS += errSymLib.c +Com_SRCS += errSymTbl.c # For bldErrSymTbl # diff --git a/src/libCom/fdmgr/Makefile b/src/libCom/fdmgr/Makefile index 97d894ac4..34b1a3dbc 100644 --- a/src/libCom/fdmgr/Makefile +++ b/src/libCom/fdmgr/Makefile @@ -10,5 +10,5 @@ SRC_DIRS += $(LIBCOM)/fdmgr INC += fdManager.h INC += fdmgr.h -SRCS += fdmgr.cpp -SRCS += fdManager.cpp +Com_SRCS += fdmgr.cpp +Com_SRCS += fdManager.cpp diff --git a/src/libCom/tools/flex/COPYING b/src/libCom/flex/COPYING similarity index 100% rename from src/libCom/tools/flex/COPYING rename to src/libCom/flex/COPYING diff --git a/src/libCom/tools/flex/Changes b/src/libCom/flex/Changes similarity index 100% rename from src/libCom/tools/flex/Changes rename to src/libCom/flex/Changes diff --git a/src/libCom/tools/flex/EPICS_READ_THIS b/src/libCom/flex/EPICS_READ_THIS similarity index 100% rename from src/libCom/tools/flex/EPICS_READ_THIS rename to src/libCom/flex/EPICS_READ_THIS diff --git a/src/libCom/tools/flex/Flex.doc b/src/libCom/flex/Flex.doc similarity index 100% rename from src/libCom/tools/flex/Flex.doc rename to src/libCom/flex/Flex.doc diff --git a/src/libCom/flex/Makefile b/src/libCom/flex/Makefile new file mode 100644 index 000000000..25048350a --- /dev/null +++ b/src/libCom/flex/Makefile @@ -0,0 +1,35 @@ +#************************************************************************* +# Copyright (c) 2011 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. +#************************************************************************* + +# This is a Makefile fragment, see src/libCom/Makefile. + +SRC_DIRS += $(LIBCOM)/flex + +parse_YACCOPT = -l -d + +SKELETON_FILE = include/flex.skel.static + +parse_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE) + +INC += flex.skel.static + +# flex.c is included in parse.c +e_flex_SRCS += ccl.c +e_flex_SRCS += dfa.c +e_flex_SRCS += ecs.c +e_flex_SRCS += gen.c +e_flex_SRCS += misc.c +e_flex_SRCS += nfa.c +e_flex_SRCS += sym.c +e_flex_SRCS += tblcmp.c +e_flex_SRCS += parse.c +e_flex_OBJS += epicsTempFile$(OBJ) + +PROD_HOST += e_flex + diff --git a/src/libCom/tools/flex/README b/src/libCom/flex/README similarity index 100% rename from src/libCom/tools/flex/README rename to src/libCom/flex/README diff --git a/src/libCom/tools/Makefile b/src/libCom/flex/RULES similarity index 62% rename from src/libCom/tools/Makefile rename to src/libCom/flex/RULES index bd7c0a8f1..3b299d8d8 100644 --- a/src/libCom/tools/Makefile +++ b/src/libCom/flex/RULES @@ -1,5 +1,5 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 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. @@ -7,13 +7,10 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../../.. +# This is a Makefile fragment, see src/libCom/Makefile. -include $(TOP)/configure/CONFIG - -DIRS = antelope flex - -flex_DEPEND_DIRS += antelope - -include $(TOP)/configure/RULES_DIRS +# Ensure that the lexer is built before it is needed +parse.c: $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE)) +clean:: + $(RM) parse.c parse.h diff --git a/src/libCom/tools/flex/ccl.c b/src/libCom/flex/ccl.c similarity index 100% rename from src/libCom/tools/flex/ccl.c rename to src/libCom/flex/ccl.c diff --git a/src/libCom/tools/flex/dfa.c b/src/libCom/flex/dfa.c similarity index 100% rename from src/libCom/tools/flex/dfa.c rename to src/libCom/flex/dfa.c diff --git a/src/libCom/tools/flex/ecs.c b/src/libCom/flex/ecs.c similarity index 100% rename from src/libCom/tools/flex/ecs.c rename to src/libCom/flex/ecs.c diff --git a/src/libCom/tools/flex/main.c b/src/libCom/flex/flex.c similarity index 100% rename from src/libCom/tools/flex/main.c rename to src/libCom/flex/flex.c diff --git a/src/libCom/tools/flex/flex.html b/src/libCom/flex/flex.html similarity index 100% rename from src/libCom/tools/flex/flex.html rename to src/libCom/flex/flex.html diff --git a/src/libCom/tools/flex/flex.skel b/src/libCom/flex/flex.skel similarity index 100% rename from src/libCom/tools/flex/flex.skel rename to src/libCom/flex/flex.skel diff --git a/src/libCom/tools/flex/flex.skel.static b/src/libCom/flex/flex.skel.static similarity index 100% rename from src/libCom/tools/flex/flex.skel.static rename to src/libCom/flex/flex.skel.static diff --git a/src/libCom/tools/flex/flexdef.h b/src/libCom/flex/flexdef.h similarity index 100% rename from src/libCom/tools/flex/flexdef.h rename to src/libCom/flex/flexdef.h diff --git a/src/libCom/tools/flex/flexdoc.html b/src/libCom/flex/flexdoc.html similarity index 100% rename from src/libCom/tools/flex/flexdoc.html rename to src/libCom/flex/flexdoc.html diff --git a/src/libCom/tools/flex/gen.c b/src/libCom/flex/gen.c similarity index 100% rename from src/libCom/tools/flex/gen.c rename to src/libCom/flex/gen.c diff --git a/src/libCom/tools/flex/libmain.c b/src/libCom/flex/libmain.c similarity index 100% rename from src/libCom/tools/flex/libmain.c rename to src/libCom/flex/libmain.c diff --git a/src/libCom/tools/flex/misc.c b/src/libCom/flex/misc.c similarity index 100% rename from src/libCom/tools/flex/misc.c rename to src/libCom/flex/misc.c diff --git a/src/libCom/tools/flex/nfa.c b/src/libCom/flex/nfa.c similarity index 100% rename from src/libCom/tools/flex/nfa.c rename to src/libCom/flex/nfa.c diff --git a/src/libCom/tools/flex/parse.y b/src/libCom/flex/parse.y similarity index 99% rename from src/libCom/tools/flex/parse.y rename to src/libCom/flex/parse.y index 402232d81..e65ecdc63 100644 --- a/src/libCom/tools/flex/parse.y +++ b/src/libCom/flex/parse.y @@ -703,5 +703,5 @@ char msg[]; #include "scan.c" #include "yylex.c" -#include "main.c" +#include "flex.c" diff --git a/src/libCom/tools/flex/scan.c b/src/libCom/flex/scan.c similarity index 100% rename from src/libCom/tools/flex/scan.c rename to src/libCom/flex/scan.c diff --git a/src/libCom/tools/flex/scan.l.DISTRIB b/src/libCom/flex/scan.l.DISTRIB similarity index 100% rename from src/libCom/tools/flex/scan.l.DISTRIB rename to src/libCom/flex/scan.l.DISTRIB diff --git a/src/libCom/tools/flex/sym.c b/src/libCom/flex/sym.c similarity index 100% rename from src/libCom/tools/flex/sym.c rename to src/libCom/flex/sym.c diff --git a/src/libCom/tools/flex/tblcmp.c b/src/libCom/flex/tblcmp.c similarity index 100% rename from src/libCom/tools/flex/tblcmp.c rename to src/libCom/flex/tblcmp.c diff --git a/src/libCom/tools/flex/yylex.c b/src/libCom/flex/yylex.c similarity index 100% rename from src/libCom/tools/flex/yylex.c rename to src/libCom/flex/yylex.c diff --git a/src/libCom/freeList/Makefile b/src/libCom/freeList/Makefile index 176c408a7..f5afa3de5 100644 --- a/src/libCom/freeList/Makefile +++ b/src/libCom/freeList/Makefile @@ -9,5 +9,5 @@ SRC_DIRS += $(LIBCOM)/freeList INC += freeList.h -SRCS += freeListLib.c +Com_SRCS += freeListLib.c HTMLS += freeList/freeList.html diff --git a/src/libCom/gpHash/Makefile b/src/libCom/gpHash/Makefile index c9567ba4e..cc6b6a5f4 100644 --- a/src/libCom/gpHash/Makefile +++ b/src/libCom/gpHash/Makefile @@ -9,5 +9,5 @@ SRC_DIRS += $(LIBCOM)/gpHash INC += gpHash.h -SRCS += gpHashLib.c +Com_SRCS += gpHashLib.c HTMLS += gpHash/gpHash.html diff --git a/src/libCom/iocsh/Makefile b/src/libCom/iocsh/Makefile index ca96eaac3..766577354 100644 --- a/src/libCom/iocsh/Makefile +++ b/src/libCom/iocsh/Makefile @@ -11,6 +11,6 @@ SRC_DIRS += $(LIBCOM)/iocsh INC += iocsh.h INC += registry.h INC += libComRegister.h -SRCS += iocsh.cpp -SRCS += registry.c -SRCS += libComRegister.c +Com_SRCS += iocsh.cpp +Com_SRCS += registry.c +Com_SRCS += libComRegister.c diff --git a/src/libCom/log/Makefile b/src/libCom/log/Makefile index c8e209785..92e4933f7 100644 --- a/src/libCom/log/Makefile +++ b/src/libCom/log/Makefile @@ -10,8 +10,8 @@ SRC_DIRS += $(LIBCOM)/log INC += iocLog.h INC += logClient.h -SRCS += iocLog.c -SRCS += logClient.c +Com_SRCS += iocLog.c +Com_SRCS += logClient.c PROD_HOST += iocLogServer diff --git a/src/libCom/macLib/Makefile b/src/libCom/macLib/Makefile index bc8a33cd3..c0be82af8 100644 --- a/src/libCom/macLib/Makefile +++ b/src/libCom/macLib/Makefile @@ -9,6 +9,6 @@ SRC_DIRS += $(LIBCOM)/macLib INC += macLib.h -SRCS += macCore.c -SRCS += macEnv.c -SRCS += macUtil.c +Com_SRCS += macCore.c +Com_SRCS += macEnv.c +Com_SRCS += macUtil.c diff --git a/src/libCom/misc/Makefile b/src/libCom/misc/Makefile index cf67e1146..d623b3225 100644 --- a/src/libCom/misc/Makefile +++ b/src/libCom/misc/Makefile @@ -31,13 +31,13 @@ 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 +Com_SRCS += aToIPAddr.c +Com_SRCS += adjustment.c +Com_SRCS += cantProceed.c +Com_SRCS += epicsConvert.c +Com_SRCS += epicsExit.c +Com_SRCS += epicsStdlib.c +Com_SRCS += epicsString.c +Com_SRCS += truncateFile.c +Com_SRCS += ipAddrToAsciiAsynchronous.cpp +Com_SRCS += epicsUnitTest.c diff --git a/src/libCom/osi/Makefile b/src/libCom/osi/Makefile index a8311fa6f..208ec6a3a 100644 --- a/src/libCom/osi/Makefile +++ b/src/libCom/osi/Makefile @@ -52,61 +52,61 @@ 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 +Com_SRCS += epicsThread.cpp +Com_SRCS += epicsMutex.cpp +Com_SRCS += epicsEvent.cpp +Com_SRCS += epicsTime.cpp +Com_SRCS += epicsMessageQueue.cpp +Com_SRCS += epicsMath.cpp -SRCS += epicsGeneralTime.c +Com_SRCS += epicsGeneralTime.c # Time providers -SRCS += osiClockTime.c -SRCS_vxWorks += osiNTPTime.c -SRCS_RTEMS += osiNTPTime.c +Com_SRCS += osiClockTime.c +Com_SRCS_vxWorks += osiNTPTime.c +Com_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 +Com_SRCS += osdSock.c +Com_SRCS += osdSockAddrReuse.cpp +Com_SRCS += osiSock.c +Com_SRCS += systemCallIntMech.cpp +Com_SRCS += epicsSocketConvertErrnoToString.cpp +Com_SRCS += osdAssert.c +Com_SRCS += osdFindSymbol.c +Com_SRCS += osdInterrupt.c +Com_SRCS += osdPoolStatus.c +Com_SRCS += osdSignal.cpp osdEnv_CFLAGS_WIN32= -U__STDC__ -SRCS += osdEnv.c +Com_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 +Com_SRCS += epicsReadline.c -SRCS += epicsTempFile.cpp -SRCS += epicsStdio.c -SRCS += osdStdio.c +Com_SRCS += epicsTempFile.cpp +Com_SRCS += epicsStdio.c +Com_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 +Com_SRCS += osdThread.c +Com_SRCS += osdMutex.c +Com_SRCS += osdEvent.c +Com_SRCS += osdTime.cpp +Com_SRCS += osdProcess.c +Com_SRCS += osdNetIntf.c +Com_SRCS += osdMessageQueue.c -SRCS += devLibVME.c -SRCS += devLibVMEOSD.c +Com_SRCS += devLibVME.c +Com_SRCS += devLibVMEOSD.c -SRCS_vxWorks += atReboot.cpp +Com_SRCS_vxWorks += atReboot.cpp # For old vxWorks applications INC_vxWorks += camacLib.h @@ -114,14 +114,14 @@ 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 +Com_SRCS_vxWorks += epicsDynLink.c +Com_SRCS_vxWorks += veclist.c +Com_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 +Com_SRCS_WIN32 += epicsGetopt.c +Com_SRCS_WIN32 += setThreadName.cpp +#Com_SRCS_WIN32 += dllmain.cpp +Com_SRCS_WIN32 += forceBadAllocException.cpp diff --git a/src/libCom/ring/Makefile b/src/libCom/ring/Makefile index 6c2e69575..ec2ecbd2d 100644 --- a/src/libCom/ring/Makefile +++ b/src/libCom/ring/Makefile @@ -11,5 +11,5 @@ 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 +Com_SRCS += epicsRingPointer.cpp +Com_SRCS += epicsRingBytes.c diff --git a/src/libCom/taskwd/Makefile b/src/libCom/taskwd/Makefile index 2562fb13e..af738f0d6 100644 --- a/src/libCom/taskwd/Makefile +++ b/src/libCom/taskwd/Makefile @@ -9,4 +9,4 @@ SRC_DIRS += $(LIBCOM)/taskwd INC += taskwd.h -SRCS += taskwd.c +Com_SRCS += taskwd.c diff --git a/src/libCom/timer/Makefile b/src/libCom/timer/Makefile index ffd5af816..51094d069 100644 --- a/src/libCom/timer/Makefile +++ b/src/libCom/timer/Makefile @@ -9,9 +9,9 @@ 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 +Com_SRCS += epicsTimer.cpp +Com_SRCS += timer.cpp +Com_SRCS += timerQueue.cpp +Com_SRCS += timerQueueActive.cpp +Com_SRCS += timerQueueActiveMgr.cpp +Com_SRCS += timerQueuePassive.cpp diff --git a/src/libCom/tools/flex/Makefile b/src/libCom/tools/flex/Makefile deleted file mode 100644 index 6e2aa8497..000000000 --- a/src/libCom/tools/flex/Makefile +++ /dev/null @@ -1,44 +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 - -HOST_WARN=NO - -YACC = $(EYACC) -YACCOPT = -l -d - -SKELETON_FILE = include/flex.skel.static - -USR_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE) - -INC += flex.skel.static - -# main.c is included in parse.c -# -SRCS += ccl.c -SRCS += dfa.c -SRCS += ecs.c -SRCS += gen.c -SRCS += misc.c -SRCS += nfa.c -SRCS += sym.c -SRCS += tblcmp.c -SRCS += parse.c - -PROD_HOST = e_flex -PROD_LIBS = Com - -include $(TOP)/configure/RULES - -clean:: - $(RM) parse.c parse.h - -# EOF Makefile.Host for base/src/toolsComm/flex diff --git a/src/libCom/tsDefs/Makefile b/src/libCom/tsDefs/Makefile index e2d5c65be..62420e138 100644 --- a/src/libCom/tsDefs/Makefile +++ b/src/libCom/tsDefs/Makefile @@ -10,4 +10,4 @@ #tsDefs contains R3.13 compatibility tsStamp code SRC_DIRS += $(LIBCOM)/tsDefs INC += tsDefs.h -SRCS += tsDefs.c +Com_SRCS += tsDefs.c diff --git a/src/libCom/tools/antelope/ACKNOWLEDGEMENTS b/src/libCom/yacc/ACKNOWLEDGEMENTS similarity index 100% rename from src/libCom/tools/antelope/ACKNOWLEDGEMENTS rename to src/libCom/yacc/ACKNOWLEDGEMENTS diff --git a/src/libCom/tools/antelope/EPICS_READ_THIS b/src/libCom/yacc/EPICS_READ_THIS similarity index 100% rename from src/libCom/tools/antelope/EPICS_READ_THIS rename to src/libCom/yacc/EPICS_READ_THIS diff --git a/src/libCom/tools/antelope/Makefile b/src/libCom/yacc/Makefile similarity index 52% rename from src/libCom/tools/antelope/Makefile rename to src/libCom/yacc/Makefile index b7435c0d1..4f2083037 100644 --- a/src/libCom/tools/antelope/Makefile +++ b/src/libCom/yacc/Makefile @@ -6,24 +6,24 @@ # 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 -SRCS += closure.c -SRCS += error.c -SRCS += lalr.c -SRCS += lr0.c -SRCS += main.c -SRCS += mkpar.c -SRCS += output.c -SRCS += reader.c -SRCS += skeleton.c -SRCS += symtab.c -SRCS += verbose.c -SRCS += warshall.c +# This is a Makefile fragment, see src/libCom/Makefile. -PROD_HOST = antelope -PROD_LIBS = Com +SRC_DIRS += $(LIBCOM)/yacc -include $(TOP)/configure/RULES +antelope_SRCS += closure.c +antelope_SRCS += error.c +antelope_SRCS += lalr.c +antelope_SRCS += lr0.c +antelope_SRCS += antelope.c +antelope_SRCS += mkpar.c +antelope_SRCS += output.c +antelope_SRCS += reader.c +antelope_SRCS += skeleton.c +antelope_SRCS += symtab.c +antelope_SRCS += verbose.c +antelope_SRCS += warshall.c +antelope_OBJS += epicsTempFile$(OBJ) + +PROD_HOST += antelope diff --git a/src/libCom/tools/antelope/NEW_FEATURES b/src/libCom/yacc/NEW_FEATURES similarity index 100% rename from src/libCom/tools/antelope/NEW_FEATURES rename to src/libCom/yacc/NEW_FEATURES diff --git a/src/libCom/tools/antelope/NOTES b/src/libCom/yacc/NOTES similarity index 100% rename from src/libCom/tools/antelope/NOTES rename to src/libCom/yacc/NOTES diff --git a/src/libCom/tools/antelope/NO_WARRANTY b/src/libCom/yacc/NO_WARRANTY similarity index 100% rename from src/libCom/tools/antelope/NO_WARRANTY rename to src/libCom/yacc/NO_WARRANTY diff --git a/src/libCom/tools/antelope/README b/src/libCom/yacc/README similarity index 100% rename from src/libCom/tools/antelope/README rename to src/libCom/yacc/README diff --git a/src/libCom/tools/antelope/main.c b/src/libCom/yacc/antelope.c similarity index 100% rename from src/libCom/tools/antelope/main.c rename to src/libCom/yacc/antelope.c diff --git a/src/libCom/tools/antelope/closure.c b/src/libCom/yacc/closure.c similarity index 100% rename from src/libCom/tools/antelope/closure.c rename to src/libCom/yacc/closure.c diff --git a/src/libCom/tools/antelope/defs.h b/src/libCom/yacc/defs.h similarity index 100% rename from src/libCom/tools/antelope/defs.h rename to src/libCom/yacc/defs.h diff --git a/src/libCom/tools/antelope/error.c b/src/libCom/yacc/error.c similarity index 100% rename from src/libCom/tools/antelope/error.c rename to src/libCom/yacc/error.c diff --git a/src/libCom/tools/antelope/lalr.c b/src/libCom/yacc/lalr.c similarity index 100% rename from src/libCom/tools/antelope/lalr.c rename to src/libCom/yacc/lalr.c diff --git a/src/libCom/tools/antelope/lr0.c b/src/libCom/yacc/lr0.c similarity index 100% rename from src/libCom/tools/antelope/lr0.c rename to src/libCom/yacc/lr0.c diff --git a/src/libCom/tools/antelope/mkpar.c b/src/libCom/yacc/mkpar.c similarity index 100% rename from src/libCom/tools/antelope/mkpar.c rename to src/libCom/yacc/mkpar.c diff --git a/src/libCom/tools/antelope/output.c b/src/libCom/yacc/output.c similarity index 100% rename from src/libCom/tools/antelope/output.c rename to src/libCom/yacc/output.c diff --git a/src/libCom/tools/antelope/reader.c b/src/libCom/yacc/reader.c similarity index 100% rename from src/libCom/tools/antelope/reader.c rename to src/libCom/yacc/reader.c diff --git a/src/libCom/tools/antelope/skeleton.c b/src/libCom/yacc/skeleton.c similarity index 100% rename from src/libCom/tools/antelope/skeleton.c rename to src/libCom/yacc/skeleton.c diff --git a/src/libCom/tools/antelope/symtab.c b/src/libCom/yacc/symtab.c similarity index 100% rename from src/libCom/tools/antelope/symtab.c rename to src/libCom/yacc/symtab.c diff --git a/src/libCom/tools/antelope/verbose.c b/src/libCom/yacc/verbose.c similarity index 100% rename from src/libCom/tools/antelope/verbose.c rename to src/libCom/yacc/verbose.c diff --git a/src/libCom/tools/antelope/warshall.c b/src/libCom/yacc/warshall.c similarity index 100% rename from src/libCom/tools/antelope/warshall.c rename to src/libCom/yacc/warshall.c diff --git a/src/libCom/tools/antelope/yacc.html b/src/libCom/yacc/yacc.html similarity index 100% rename from src/libCom/tools/antelope/yacc.html rename to src/libCom/yacc/yacc.html