diff --git a/src/makeBaseApp/Makefile b/src/makeBaseApp/Makefile index 19db019e5..08725213b 100644 --- a/src/makeBaseApp/Makefile +++ b/src/makeBaseApp/Makefile @@ -51,7 +51,8 @@ TEMPLATES += top/simpleBoot/nfsCommands TEMPLATES += top/simpleBoot/ioc/Makefile TEMPLATES += top/simpleBoot/ioc/st.cmd -SCRIPTS += makeBaseApp.pl +SCRIPTS_DEFAULT += makeBaseApp.pl +SCRIPTS_vxWorks += makeBaseApp.pl include $(TOP)/configure/RULES_BUILD diff --git a/src/makeBaseApp/top/configure/Makefile b/src/makeBaseApp/top/configure/Makefile index d231fc116..65fd1d270 100644 --- a/src/makeBaseApp/top/configure/Makefile +++ b/src/makeBaseApp/top/configure/Makefile @@ -6,7 +6,6 @@ TOP=.. include $(TOP)/configure/CONFIG TARGETS = CONFIG_APP_INCLUDE -IOC_TARGETS = $(TARGETS) include $(TOP)/configure/RULES_BUILD diff --git a/src/makeBaseApp/top/configure/RULES.Db b/src/makeBaseApp/top/configure/RULES.Db index ba397394d..ee25072fc 100644 --- a/src/makeBaseApp/top/configure/RULES.Db +++ b/src/makeBaseApp/top/configure/RULES.Db @@ -160,7 +160,7 @@ ifdef DBDEXPAND $(DBDNAME): ../$(DBDEXPAND) @echo "Expanding dbd" @$(RM) $@ - $(DBEXPAND) $(USER_DBDFLAGS) $< > $@ + $(DBEXPAND) $(USR_DBDFLAGS) $< > $@ endif ##################################################### Dependencies diff --git a/src/makeBaseApp/top/configure/RULES.ioc b/src/makeBaseApp/top/configure/RULES.ioc index 67f622afa..32bb502fa 100644 --- a/src/makeBaseApp/top/configure/RULES.ioc +++ b/src/makeBaseApp/top/configure/RULES.ioc @@ -1,9 +1,9 @@ #RULES.ioc include $(EPICS_BASE)/configure/RULES_DIRS -buildInstall:: cdCommands +buildInstall: cdCommands cdCommands: Makefile $(PERL) $(TOP)/configure/makeIocCdCommands.pl $(ARCH) -clean:: +clean: @$(RM) cdCommands diff --git a/src/makeBaseApp/top/configure/RULES_BUILD b/src/makeBaseApp/top/configure/RULES_BUILD index 116112461..3a87d0322 100644 --- a/src/makeBaseApp/top/configure/RULES_BUILD +++ b/src/makeBaseApp/top/configure/RULES_BUILD @@ -1,2 +1,3 @@ #RULES_BUILD include $(EPICS_BASE)/configure/RULES_BUILD +include $(TOP)/configure/RULES.registerRecordDeviceDriver diff --git a/src/makeBaseApp/top/exampleApp/Db/Makefile b/src/makeBaseApp/top/exampleApp/Db/Makefile index d81230b37..cbd81aaa4 100644 --- a/src/makeBaseApp/top/exampleApp/Db/Makefile +++ b/src/makeBaseApp/top/exampleApp/Db/Makefile @@ -4,7 +4,7 @@ include $(TOP)/configure/CONFIG # ADD MACRO DEFINITIONS AFTER THIS LINE #---------------------------------------------------- -# Optimization of db files using dbst (default: NO) +# Optimization of db files using dbst (DEFAULT: NO) #DB_OPT = YES #---------------------------------------------------- diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/makeBaseApp/top/exampleApp/src/Makefile index cfffd482c..b58ec1ec1 100644 --- a/src/makeBaseApp/top/exampleApp/src/Makefile +++ b/src/makeBaseApp/top/exampleApp/src/Makefile @@ -11,32 +11,23 @@ DBDNAME = exampleApp.dbd 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) -PROD += caExample +PROD_DEFAULT += caExample +PROD_vxWorks += -nil- -IOC_LIBRARY = exampleLib +LIBRARY_vxWorks = exampleLib exampleLib_SRCS += xxxRecord.c exampleLib_SRCS += devXxxSoft.c exampleLib_SRCS += sncExample.c -LIBOBJS += $(EPICS_BASE_BIN)/iocCore -LIBOBJS += $(EPICS_BASE_BIN)/seq - -#choose either - -#LIBOBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o - -# or - exampleLib_SRCS += registerRecordDeviceDriver.c -#end choices +LIBOBJS += $(EPICS_BASE_BIN)/iocCore +LIBOBJS += $(EPICS_BASE_BIN)/seq -include ../baseLIBOBJS @@ -44,6 +35,5 @@ exampleLib_SRCS += registerRecordDeviceDriver.c #library $(LIBNAME) may be HUGE (>3kB) # include $(TOP)/configure/RULES_BUILD -include $(TOP)/configure/RULES.registerRecordDeviceDriver #---------------------------------------- # ADD RULES AFTER THIS LINE diff --git a/src/makeBaseApp/top/simpleApp/Db/Makefile b/src/makeBaseApp/top/simpleApp/Db/Makefile index 15c24650c..ffe017479 100644 --- a/src/makeBaseApp/top/simpleApp/Db/Makefile +++ b/src/makeBaseApp/top/simpleApp/Db/Makefile @@ -5,7 +5,7 @@ include $(TOP)/configure/CONFIG # ADD MACRO DEFINITIONS AFTER THIS LINE #---------------------------------------------------- -# Optimization of DB files using dbst (default: NO) +# Optimization of DB files using dbst (DEFAULT: NO) #DB_OPT = YES #---------------------------------------------------- diff --git a/src/makeBaseApp/top/simpleApp/src/Makefile b/src/makeBaseApp/top/simpleApp/src/Makefile index c92d9e3af..c549598db 100644 --- a/src/makeBaseApp/top/simpleApp/src/Makefile +++ b/src/makeBaseApp/top/simpleApp/src/Makefile @@ -7,11 +7,9 @@ include $(TOP)/configure/CONFIG 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 @@ -29,7 +27,6 @@ Osi_DIR = $(EPICS_BASE_LIB) #end choices include $(TOP)/configure/RULES_BUILD -include $(TOP)/configure/RULES.registerRecordDeviceDriver #---------------------------------------- # ADD RULES AFTER THIS LINE diff --git a/src/rec/Makefile b/src/rec/Makefile index dbb0378bd..286855022 100644 --- a/src/rec/Makefile +++ b/src/rec/Makefile @@ -52,46 +52,46 @@ RECTYPES += waveformRecord.h USR_INCLUDES = -I../drv/ansi -I../../drv/old -IOC_PROD_vxWorks += aaiRecord.o -IOC_PROD_vxWorks += aaoRecord.o -IOC_PROD_vxWorks += aiRecord.o -IOC_PROD_vxWorks += aoRecord.o -IOC_PROD_vxWorks += biRecord.o -IOC_PROD_vxWorks += boRecord.o -IOC_PROD_vxWorks += calcRecord.o -IOC_PROD_vxWorks += calcoutRecord.o -IOC_PROD_vxWorks += compressRecord.o -IOC_PROD_vxWorks += dfanoutRecord.o -IOC_PROD_vxWorks += egRecord.o -IOC_PROD_vxWorks += egeventRecord.o -IOC_PROD_vxWorks += erRecord.o -IOC_PROD_vxWorks += ereventRecord.o -IOC_PROD_vxWorks += eventRecord.o -IOC_PROD_vxWorks += fanoutRecord.o -IOC_PROD_vxWorks += gsubRecord.o -IOC_PROD_vxWorks += histogramRecord.o -IOC_PROD_vxWorks += longinRecord.o -IOC_PROD_vxWorks += longoutRecord.o -IOC_PROD_vxWorks += mbbiRecord.o -IOC_PROD_vxWorks += mbbiDirectRecord.o -IOC_PROD_vxWorks += mbboRecord.o -IOC_PROD_vxWorks += mbboDirectRecord.o -IOC_PROD_vxWorks += palRecord.o -IOC_PROD_vxWorks += permissiveRecord.o -IOC_PROD_vxWorks += pidRecord.o -IOC_PROD_vxWorks += pulseCounterRecord.o -IOC_PROD_vxWorks += pulseDelayRecord.o -IOC_PROD_vxWorks += pulseTrainRecord.o -IOC_PROD_vxWorks += selRecord.o -IOC_PROD_vxWorks += seqRecord.o -IOC_PROD_vxWorks += stateRecord.o -IOC_PROD_vxWorks += steppermotorRecord.o -IOC_PROD_vxWorks += stringinRecord.o -IOC_PROD_vxWorks += stringoutRecord.o -IOC_PROD_vxWorks += subRecord.o -IOC_PROD_vxWorks += subArrayRecord.o -IOC_PROD_vxWorks += timerRecord.o -IOC_PROD_vxWorks += waveformRecord.o +PROD_vxWorks += aaiRecord.o +PROD_vxWorks += aaoRecord.o +PROD_vxWorks += aiRecord.o +PROD_vxWorks += aoRecord.o +PROD_vxWorks += biRecord.o +PROD_vxWorks += boRecord.o +PROD_vxWorks += calcRecord.o +PROD_vxWorks += calcoutRecord.o +PROD_vxWorks += compressRecord.o +PROD_vxWorks += dfanoutRecord.o +PROD_vxWorks += egRecord.o +PROD_vxWorks += egeventRecord.o +PROD_vxWorks += erRecord.o +PROD_vxWorks += ereventRecord.o +PROD_vxWorks += eventRecord.o +PROD_vxWorks += fanoutRecord.o +PROD_vxWorks += gsubRecord.o +PROD_vxWorks += histogramRecord.o +PROD_vxWorks += longinRecord.o +PROD_vxWorks += longoutRecord.o +PROD_vxWorks += mbbiRecord.o +PROD_vxWorks += mbbiDirectRecord.o +PROD_vxWorks += mbboRecord.o +PROD_vxWorks += mbboDirectRecord.o +PROD_vxWorks += palRecord.o +PROD_vxWorks += permissiveRecord.o +PROD_vxWorks += pidRecord.o +PROD_vxWorks += pulseCounterRecord.o +PROD_vxWorks += pulseDelayRecord.o +PROD_vxWorks += pulseTrainRecord.o +PROD_vxWorks += selRecord.o +PROD_vxWorks += seqRecord.o +PROD_vxWorks += stateRecord.o +#PROD_vxWorks += steppermotorRecord.o +PROD_vxWorks += stringinRecord.o +PROD_vxWorks += stringoutRecord.o +PROD_vxWorks += subRecord.o +PROD_vxWorks += subArrayRecord.o +PROD_vxWorks += timerRecord.o +PROD_vxWorks += waveformRecord.o include $(TOP)/configure/RULES_BUILD diff --git a/src/registry/Makefile b/src/registry/Makefile index f5385f9b9..d23db1664 100644 --- a/src/registry/Makefile +++ b/src/registry/Makefile @@ -5,9 +5,9 @@ include $(TOP)/configure/CONFIG # INC += registry.h -INC += registryDeviceSupport.h -INC += registryDriverSupport.h -INC += registryRecordType.h +#INC += registryDeviceSupport.h moved header to src/include +#INC += registryDriverSupport.h moved header to src/include +#INC += registryRecordType.h moved header to src/include # general contents of library on all platforms # @@ -16,15 +16,17 @@ INC += registryRecordType.h # 2) where to find the sources: ., ./os/, ./os/generic, ... # -SCRIPTS += registerRecordDeviceDriver.pl +SCRIPTS_DEFAULT += registerRecordDeviceDriver.pl +SCRIPTS_vxWorks += registerRecordDeviceDriver.pl registryLibrary_SRCS += registry.c registryLibrary_SRCS += registryRecordType.c registryLibrary_SRCS += registryDeviceSupport.c registryLibrary_SRCS += registryDriverSupport.c -IOC_PROD_vxWorks = registerRecordDeviceDriver.o +PROD_vxWorks = registerRecordDeviceDriver.o -IOC_LIBRARY_vxWorks = registryLibrary +LIBRARY_vxWorks = registryLibrary include $(TOP)/configure/RULES_BUILD +