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
This commit is contained in:
Michael Davidsaver
2011-02-25 15:39:44 -06:00
committed by Andrew Johnson
parent 588ea50bfb
commit f7fc564556
75 changed files with 182 additions and 222 deletions

View File

@@ -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

22
src/libCom/as/RULES Normal file
View File

@@ -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

View File

@@ -1,36 +0,0 @@
#include <Winver.h>
#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