epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Remove 3.13 compatibility build vars

Browse Source
This commit is contained in:
Andrew Johnson
2010-10-12 11:27:17 -05:00
parent fc43152e42
commit cf7f84cb2f
22 changed files with 11 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
#
@@ -18,12 +17,8 @@ include $(TOP)/configure/CONFIG
TOOLS = $(TOP)/src/tools
DIRS += configure src
ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
DIRS += config
endif
src_DEPEND_DIRS = configure
config_DEPEND_DIRS = src
include $(TOP)/configure/RULES_TOP

3
src/Makefile
View File

@@ -66,9 +66,6 @@ misc_DEPEND_DIRS = dbtools rsrv rec
DIRS += dev
dev_DEPEND_DIRS = rec misc
DIRS += vxWorks
vxWorks_DEPEND_DIRS = registry misc dbtools
DIRS += RTEMS
RTEMS_DEPEND_DIRS = libCom

3
src/RTEMS/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
#

6
src/as/Makefile
View File

@@ -35,12 +35,6 @@ PROD_HOST = ascheck
ascheck_SRCS = ascheck.c
PROD_LIBS = asHost dbStaticHost ca Com
# For R3.13 compatibility only
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks=asIoc
OBJLIB_SRCS += $(LIB_SRCS) $(asIoc_SRCS)
endif
include $(TOP)/configure/RULES
# Extra rule since asLib_lex.c is included by asLib.c

3
src/bpt/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../..

9
src/ca/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
@@ -76,12 +75,6 @@ LIBRARY=ca
ca_RCS = ca.rc
# For R3.13 compatibility only
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks=ca
OBJLIB_SRCS = $(LIBSRCS)
endif
ca_LIBS = Com
ca_SYS_LIBS_WIN32 = ws2_32 advapi32 user32

3
src/cas/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************

6
src/db/Makefile
View File

@@ -79,12 +79,6 @@ dbIoc_LIBS = dbStaticIoc ca Com
dbIoc_RCS = dbIoc.rc
# For R3.13 compatibility only
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks=dbIoc
OBJLIB_SRCS = $(LIB_SRCS)
endif
include $(TOP)/configure/RULES
dbCommon.h$(DEP): ../dbCommonRecord.dbd ../dbCommon.dbd

8
src/dbStatic/Makefile
View File

@@ -35,12 +35,6 @@ dbStaticIoc_SRCS += dbStaticIocRegister.c
LIBRARY_HOST += dbStaticHost
LIBRARY_IOC += dbStaticIoc
# For R3.13 compatibility only
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks=dbStaticIoc
OBJLIB_SRCS = $(LIBSRCS) $(dbStaticIoc_SRCS)
endif
dbStaticHost_LIBS = Com
dbStaticIoc_LIBS = Com
@@ -62,5 +56,3 @@ dbYacc.c: dbLex.c ../dbLexRoutines.c
clean::
@$(RM) dbLex.c dbYacc.c
# EOF Makefile.Host for base/src/dbStatic

9
src/dbtools/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../..
@@ -25,12 +24,6 @@ dbtoolsIoc_RCS = dbtoolsIoc.rc
HTMLS += dbLoadTemplate.html
# For R3.13 compatibility only
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks=dbtoolsIoc
OBJLIB_SRCS = $(LIB_SRCS)
endif
include $(TOP)/configure/RULES
#

3
src/dev/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************

5
src/dev/softDev/Makefile
View File

@@ -56,11 +56,6 @@ LIBRARY_IOC += softDevIoc
softDevIoc_LIBS += miscIoc recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
softDevIoc_RCS = softDevIoc.rc
# For R3.13 compatability
ifeq ($(strip $(COMPAT_313)),YES)
OBJS_vxWorks = $(LIBSRCS:%.c=%)
endif
include $(TOP)/configure/RULES

5
src/dev/testDev/Makefile
View File

@@ -19,9 +19,4 @@ LIBRARY_IOC = testDevIoc
testDevIoc_LIBS += miscIoc recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
testDevIoc_RCS = testDevIoc.rc
# For R3.13 compatability
ifeq ($(strip $(COMPAT_313)),YES)
OBJS_vxWorks = $(LIBSRCS:%.c=%)
endif
include $(TOP)/configure/RULES

3
src/excas/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************

10
src/gdd/Makefile
View File

@@ -62,13 +62,6 @@ genApps_SYS_LIBS_WIN32 = ws2_32
# aitGen.c doesn't compile for linux-arm at -O3 when using gcc-3.4.5
aitGen_CFLAGS_linux-arm = -O2
# Switch off potentially bogus warnings on HPUX 11 - detailed warning
# suppression in the source code would be too much effort with respect
# to gdd's limited future
HPWARNFLAGS_NO = +W361 +W392 +W655 +W749 +W818 +W930
USR_CXXFLAGS_hpux = $(HPWARNFLAGS_$(GNU))
include $(TOP)/configure/RULES
# cannot generate these dependencies automatically
@@ -92,6 +85,3 @@ $(COMMON_DIR)/gddApps.h : $(TOOLS)/genApps$(HOSTEXE)
clean::
@$(RM) $(COMMON_DIR)/aitConvertGenerated.cc
# EOF base/src/gdd/Makefile

6
src/libCom/Makefile
View File

@@ -287,12 +287,6 @@ Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
Com_RCS = Com.rc
# For R3.13 compatibility only
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks=Com
OBJLIB_SRCS = $(SRCS)
endif
# libs needed for PROD and TESTPRODUCT
PROD_LIBS = Com
PROD_SYS_LIBS_WIN32 = ws2_32 advapi32

6
src/misc/Makefile
View File

@@ -32,11 +32,5 @@ LIBRARY_IOC = miscIoc
miscIoc_RCS = miscIoc.rc
miscIoc_LIBS = rsrvIoc asIoc dbtoolsIoc dbIoc registryIoc dbStaticIoc ca Com
# For R3.13 compatibility only
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks=miscIoc
OBJLIB_SRCS = $(LIB_SRCS)
endif
include $(TOP)/configure/RULES

8
src/rec/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../..
@@ -75,10 +74,5 @@ LIBRARY_IOC += recIoc
recIoc_LIBS = asIoc dbIoc registryIoc dbStaticIoc ca Com
recIoc_RCS = recIoc.rc
# For R3.13 compatability
ifeq ($(strip $(COMPAT_313)),YES)
OBJS_vxWorks = $(LIBSRCS:%.c=%)
endif
include $(TOP)/configure/RULES

5
src/registry/Makefile
View File

@@ -31,10 +31,5 @@ registryIoc_LIBS = dbStaticIoc Com
registryIoc_RCS = registryIoc.rc
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks = registryIoc
OBJLIB_SRCS = $(LIB_SRCS)
endif
include $(TOP)/configure/RULES

6
src/rsrv/Makefile
View File

@@ -30,10 +30,4 @@ rsrvIoc_LIBS = asIoc dbIoc ca Com
rsrvIoc_SYS_LIBS_WIN32 := ws2_32
rsrvIoc_RCS = rsrvIoc.rc
# For R3.13 compatibility only
ifeq ($(strip $(COMPAT_313)),YES)
OBJLIB_vxWorks=rsrvIoc
OBJLIB_SRCS = $(LIB_SRCS)
endif
include $(TOP)/configure/RULES

3
src/toolsComm/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************

5
src/util/Makefile
View File

@@ -3,8 +3,7 @@
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../..
@@ -34,5 +33,3 @@ include $(TOP)/configure/RULES
S99%: ../rc2.%
sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
# EOF Makefile.Host for base/src/util