changes for 3.14

This commit is contained in:
Marty Kraimer
1999-09-13 20:20:05 +00:00
parent 476cfe5cb7
commit d4a16bd8c5
10 changed files with 136 additions and 2379 deletions
+97 -2
View File
@@ -1,6 +1,101 @@
TOP=../..
include $(TOP)/config/CONFIG_BASE
include $(TOP)/configure/CONFIG
include $(TOP)/config/RULES_ARCHS
TEMPLATES_DIR = makeBaseApp
TEMPLATES += top/Makefile
TEMPLATES += top/configure/RELEASE
TEMPLATES += top/configure/RULES.Db
TEMPLATES += top/configure/RULES.ioc
TEMPLATES += top/configure/RULES.iocBoot
TEMPLATES += top/configure/makeDbDepends.pl
TEMPLATES += top/configure/makeIocCdCommands.pl
TEMPLATES += top/configure/replaceVAR.pl
TEMPLATES += $(TOP)/configure/CONFIG
TEMPLATES += $(TOP)/configure/CONFIG.CrossCommon
TEMPLATES += $(TOP)/configure/CONFIG.Host.WIN32
TEMPLATES += $(TOP)/configure/CONFIG.Host.linux
TEMPLATES += $(TOP)/configure/CONFIG.Host.linux-x86
TEMPLATES += $(TOP)/configure/CONFIG.Host.solaris
TEMPLATES += $(TOP)/configure/CONFIG.Host.solaris-sparc
TEMPLATES += $(TOP)/configure/CONFIG.Host.sun4-68k
TEMPLATES += $(TOP)/configure/CONFIG.Host.win32-x86
TEMPLATES += $(TOP)/configure/CONFIG.Target.UnixCommon
TEMPLATES += $(TOP)/configure/CONFIG.Target.linux-x86
TEMPLATES += $(TOP)/configure/CONFIG.Target.mv162
TEMPLATES += $(TOP)/configure/CONFIG.Target.mv162lc
TEMPLATES += $(TOP)/configure/CONFIG.Target.mv167
TEMPLATES += $(TOP)/configure/CONFIG.Target.mv177
TEMPLATES += $(TOP)/configure/CONFIG.Target.solaris
TEMPLATES += $(TOP)/configure/CONFIG.Target.solaris-sparc
TEMPLATES += $(TOP)/configure/CONFIG.Target.sun4-68k
TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-486
TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-68040
TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-68040lc
TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-68060
TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-ppc604
TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorksCommon
TEMPLATES += $(TOP)/configure/CONFIG.Target.win32-x86
TEMPLATES += $(TOP)/configure/CONFIG_BASE_VERSION
TEMPLATES += $(TOP)/configure/CONFIG_COMMON
TEMPLATES += $(TOP)/configure/CONFIG_ENV
TEMPLATES += $(TOP)/configure/CONFIG_EPICS_BASE
TEMPLATES += $(TOP)/configure/CONFIG_SITE
TEMPLATES += $(TOP)/configure/CONFIG_SITE.Host.WIN32-x86
TEMPLATES += $(TOP)/configure/CONFIG_SITE_ENV
TEMPLATES += $(TOP)/configure/RULES_ARCHS
TEMPLATES += $(TOP)/configure/RULES_BUILD
TEMPLATES += $(TOP)/configure/RULES_DIRS
TEMPLATES += $(TOP)/configure/RULES_TOP
TEMPLATES += $(TOP)/configure/tools/cp.pl
TEMPLATES += $(TOP)/configure/tools/findbase.pl
TEMPLATES += $(TOP)/configure/tools/getrel
TEMPLATES += $(TOP)/configure/tools/installEpics
TEMPLATES += $(TOP)/configure/tools/installEpics.pl
TEMPLATES += $(TOP)/configure/tools/makeMakefile.pl
TEMPLATES += $(TOP)/configure/tools/mkdir.pl
TEMPLATES += $(TOP)/configure/tools/mv.pl
TEMPLATES += $(TOP)/configure/tools/rm.pl
TEMPLATES += $(TOP)/configure/tools/testmkdir
TEMPLATES += top/exampleApp/Makefile
TEMPLATES += top/exampleApp/Db/Makefile
TEMPLATES += top/exampleApp/Db/Makefile.Host
TEMPLATES += top/exampleApp/Db/dbExample1.db
TEMPLATES += top/exampleApp/Db/dbExample2.substitutions
TEMPLATES += top/exampleApp/Db/dbExample2.template
TEMPLATES += top/exampleApp/src/Makefile
TEMPLATES += top/exampleApp/src/Makefile.Host
TEMPLATES += top/exampleApp/src/Makefile.Vx
TEMPLATES += top/exampleApp/src/caExample.c
TEMPLATES += top/exampleApp/src/devXxxSoft.c
TEMPLATES += top/exampleApp/src/exampleInclude.dbd
TEMPLATES += top/exampleApp/src/sncExample.st
TEMPLATES += top/exampleApp/src/xxxRecord.c
TEMPLATES += top/exampleApp/src/xxxRecord.dbd
TEMPLATES += top/exampleApp/src/base.dbd
TEMPLATES += top/exampleApp/src/baseLIBOBJS
TEMPLATES += top/simpleApp/Makefile
TEMPLATES += top/simpleApp/Db/Makefile
TEMPLATES += top/simpleApp/Db/Makefile.Host
TEMPLATES += top/simpleApp/src/Makefile
TEMPLATES += top/simpleApp/src/Makefile.Host
TEMPLATES += top/simpleApp/src/Makefile.Vx
TEMPLATES += top/simpleBoot/Makefile
TEMPLATES += top/simpleBoot/nfsCommands
TEMPLATES += top/simpleBoot/ioc/Makefile
TEMPLATES += top/simpleBoot/ioc/st.cmd
TEMPLATES += top/exampleBoot/Makefile
TEMPLATES += top/exampleBoot/nfsCommands
TEMPLATES += top/exampleBoot/ioc/Makefile
TEMPLATES += top/exampleBoot/ioc/st.cmd
SCRIPTS += makeBaseApp.pl
include $(TOP)/configure/RULES_BUILD
-62
View File
@@ -1,62 +0,0 @@
TOP = ../../..
include $(TOP)/config/CONFIG_BASE
TEMPLATES_DIR = makeBaseApp
TEMPLATES += top/Makefile
TEMPLATES += top/config/CONFIG
TEMPLATES += top/config/CONFIG_APP
TEMPLATES += top/config/Makefile
TEMPLATES += top/config/Makefile.Host
TEMPLATES += top/config/Makefile.Vx
TEMPLATES += top/config/RELEASE
TEMPLATES += top/config/RULES.Db
TEMPLATES += top/config/RULES.Host
TEMPLATES += top/config/RULES.Vx
TEMPLATES += top/config/RULES.ioc
TEMPLATES += top/config/RULES.iocBoot
TEMPLATES += top/config/RULES_ARCHS
TEMPLATES += top/config/RULES_DIRS
TEMPLATES += top/config/RULES_TOP
TEMPLATES += top/config/makeDbDepends.pl
TEMPLATES += top/config/makeIocCdCommands.pl
TEMPLATES += top/config/makeConfigAppInclude.pl
TEMPLATES += top/config/replaceVAR.pl
TEMPLATES += top/exampleApp/Makefile
TEMPLATES += top/exampleApp/Db/Makefile
TEMPLATES += top/exampleApp/Db/Makefile.Host
TEMPLATES += top/exampleApp/Db/dbExample1.db
TEMPLATES += top/exampleApp/Db/dbExample2.substitutions
TEMPLATES += top/exampleApp/Db/dbExample2.template
TEMPLATES += top/exampleApp/src/Makefile
TEMPLATES += top/exampleApp/src/Makefile.Host
TEMPLATES += top/exampleApp/src/Makefile.Vx
TEMPLATES += top/exampleApp/src/caExample.c
TEMPLATES += top/exampleApp/src/devXxxSoft.c
TEMPLATES += top/exampleApp/src/exampleInclude.dbd
TEMPLATES += top/exampleApp/src/sncExample.st
TEMPLATES += top/exampleApp/src/xxxRecord.c
TEMPLATES += top/exampleApp/src/xxxRecord.dbd
TEMPLATES += top/exampleApp/src/base.dbd
TEMPLATES += top/exampleApp/src/baseLIBOBJS
TEMPLATES += top/simpleApp/Makefile
TEMPLATES += top/simpleApp/Db/Makefile
TEMPLATES += top/simpleApp/Db/Makefile.Host
TEMPLATES += top/simpleApp/src/Makefile
TEMPLATES += top/simpleApp/src/Makefile.Host
TEMPLATES += top/simpleApp/src/Makefile.Vx
TEMPLATES += top/simpleBoot/Makefile
TEMPLATES += top/simpleBoot/nfsCommands
TEMPLATES += top/simpleBoot/ioc/Makefile
TEMPLATES += top/simpleBoot/ioc/st.cmd
TEMPLATES += top/exampleBoot/Makefile
TEMPLATES += top/exampleBoot/nfsCommands
TEMPLATES += top/exampleBoot/ioc/Makefile
TEMPLATES += top/exampleBoot/ioc/st.cmd
SCRIPTS += makeBaseApp.pl
include $(TOP)/config/RULES.Host
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -1,9 +1,9 @@
#Makefile at top of application tree
TOP = .
include $(TOP)/config/CONFIG_APP
include $(TOP)/configure/CONFIG
DIRS += config
DIRS += $(wildcard *App)
DIRS += $(wildcard *app)
DIRS += $(wildcard iocBoot)
DIRS += $(wildcard iocboot)
include $(TOP)/config/RULES_TOP
include $(TOP)/configure/RULES_TOP
+2 -2
View File
@@ -1,7 +1,7 @@
TOP = ..
include $(TOP)/config/CONFIG_APP
include $(TOP)/configure/CONFIG
DIRS += $(wildcard *src*)
DIRS += $(wildcard *Src*)
DIRS += $(wildcard *db*)
DIRS += $(wildcard *Db*)
include $(TOP)/config/RULES_DIRS
include $(TOP)/configure/RULES_DIRS
@@ -8,8 +8,6 @@
#< ../nfsCommands
cd appbin
ld < iocCore
ld < seq
ld < exampleLib
cd startup
+35 -2
View File
@@ -1,3 +1,36 @@
TOP=../..
include $(TOP)/config/CONFIG_APP
include $(TOP)/config/RULES_ARCHS
include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#USR_CFLAGS +=
PROD_LIBS += ca
PROD_LIBS += Db
PROD_LIBS += Com
PROD_LIBS += Osi
ca_DIR = $(EPICS_BASE_LIB)
Db_DIR = $(EPICS_BASE_LIB)
Com_DIR = $(EPICS_BASE_LIB)
Osi_DIR = $(EPICS_BASE_LIB)
#RECTYPES += xxxRecord.h
#DBDEXPAND = exampleInclude.dbd
#DBDNAME = exampleApp.dbd
#LIBOBJS +=
#choose either
#LIBOBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o
# or
#EXPANDED_DBD = exampleApp.dbd
#LIBOBJS += registerRecordDeviceDriver.o
#end choices
include $(TOP)/configure/RULES_BUILD
include $(TOP)/config/RULES.registerRecordDeviceDriver
#----------------------------------------
# ADD RULES AFTER THIS LINE
@@ -1,18 +0,0 @@
# Makefile.Host
TOP = ../../..
include $(TOP)/config/CONFIG_APP
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#USR_CFLAGS +=
PROD_LIBS += ca
PROD_LIBS += Db
PROD_LIBS += Com
ca_DIR = $(EPICS_BASE_LIB)
Db_DIR = $(EPICS_BASE_LIB)
Com_DIR = $(EPICS_BASE_LIB)
include $(TOP)/config/RULES.Host
#----------------------------------------
# ADD RULES AFTER THIS LINE
@@ -1,13 +0,0 @@
# Makefile.Vx
TOP = ../../..
include $(TOP)/config/CONFIG_APP
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#Note that the command line that builds the
#library $(LIBNAME) may be HUGE (>3kB)
#
include $(TOP)/config/RULES.Vx
#----------------------------------------
# ADD RULES AFTER THIS LINE
@@ -7,8 +7,6 @@
#< ../nfsCommands
cd appbin
ld < iocCore
ld < seq
#ld < _APPNAME_Lib
cd startup