diff --git a/Makefile b/Makefile index 649403dc5..e733d8c99 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/src/Makefile b/src/Makefile index 5e2c660ae..66b959101 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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 diff --git a/src/RTEMS/Makefile b/src/RTEMS/Makefile index db0cca944..526c8eba0 100644 --- a/src/RTEMS/Makefile +++ b/src/RTEMS/Makefile @@ -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. #************************************************************************* # diff --git a/src/as/Makefile b/src/as/Makefile index ef3e0ba0f..0f72ae7ab 100644 --- a/src/as/Makefile +++ b/src/as/Makefile @@ -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 diff --git a/src/bpt/Makefile b/src/bpt/Makefile index f78b13d98..de98cd0f4 100644 --- a/src/bpt/Makefile +++ b/src/bpt/Makefile @@ -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=../.. diff --git a/src/ca/Makefile b/src/ca/Makefile index db4186d16..ffbfa2bef 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -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 diff --git a/src/cas/Makefile b/src/cas/Makefile index 7206ff531..e6fd6ea91 100644 --- a/src/cas/Makefile +++ b/src/cas/Makefile @@ -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. #************************************************************************* diff --git a/src/db/Makefile b/src/db/Makefile index 0ebdffdb6..6898107a7 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -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 diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile index 0f4590c75..aa29eb968 100644 --- a/src/dbStatic/Makefile +++ b/src/dbStatic/Makefile @@ -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 diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile index 38ed52c9e..4ae2d322c 100644 --- a/src/dbtools/Makefile +++ b/src/dbtools/Makefile @@ -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 # diff --git a/src/dev/Makefile b/src/dev/Makefile index 64a9721ac..cdd320ca5 100644 --- a/src/dev/Makefile +++ b/src/dev/Makefile @@ -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. #************************************************************************* diff --git a/src/dev/softDev/Makefile b/src/dev/softDev/Makefile index 6c4f11cb0..4c3eb5a51 100644 --- a/src/dev/softDev/Makefile +++ b/src/dev/softDev/Makefile @@ -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 diff --git a/src/dev/testDev/Makefile b/src/dev/testDev/Makefile index 19c30b242..6aec38ca6 100644 --- a/src/dev/testDev/Makefile +++ b/src/dev/testDev/Makefile @@ -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 diff --git a/src/excas/Makefile b/src/excas/Makefile index 0d4d51638..72950f2ef 100644 --- a/src/excas/Makefile +++ b/src/excas/Makefile @@ -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. #************************************************************************* diff --git a/src/gdd/Makefile b/src/gdd/Makefile index e6c58c1d2..7843f67b8 100644 --- a/src/gdd/Makefile +++ b/src/gdd/Makefile @@ -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 - diff --git a/src/libCom/Makefile b/src/libCom/Makefile index 7f0168fb0..57c2f7ab0 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -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 diff --git a/src/misc/Makefile b/src/misc/Makefile index 3d7bc5168..78bf27229 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -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 diff --git a/src/rec/Makefile b/src/rec/Makefile index 0d4b78aa8..c634062ba 100644 --- a/src/rec/Makefile +++ b/src/rec/Makefile @@ -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 diff --git a/src/registry/Makefile b/src/registry/Makefile index bacb70471..5a4f904ea 100644 --- a/src/registry/Makefile +++ b/src/registry/Makefile @@ -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 diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile index e420ba848..002cc42d8 100644 --- a/src/rsrv/Makefile +++ b/src/rsrv/Makefile @@ -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 diff --git a/src/toolsComm/Makefile b/src/toolsComm/Makefile index ef3e0c0ce..cf31067b2 100644 --- a/src/toolsComm/Makefile +++ b/src/toolsComm/Makefile @@ -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. #************************************************************************* diff --git a/src/util/Makefile b/src/util/Makefile index e0cd22c77..5ca7c798a 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -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