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

Merge std/*

Browse Source 
Combine recIoc and softDevIoc libraries into dbRecStd

Move base.dbd from ioc/misc/ to std/softIoc/

Generate stdRecords.dbd from the std/rec/Makefile list of record
types instead of hard-coding it in base.dbd
This commit is contained in:
Michael Davidsaver
2011-02-26 18:24:51 -06:00
committed by Andrew Johnson
parent e463793bc3
commit f242a27dea
14 changed files with 177 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure/CONFIG_BASE
View File

@@ -21,8 +21,7 @@ endif
#---------------------------------------------------------------
# Epics base Ioc libraries
EPICS_BASE_IOC_LIBS += recIoc softDevIoc
EPICS_BASE_IOC_LIBS += dbCore ca Com
EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com
#---------------------------------------------------------------
# Epics base Host libraries

2
configure/RULES.Db
View File

@@ -263,7 +263,7 @@ $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd
$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
$(ECHO) "Expanding dbd"
@$(RM) $@
@$(DBEXPAND) $(DBDFLAGS) -o $@ $<
$(DBEXPAND) $(DBDFLAGS) -o $@ $<
$(COMMON_DIR)/%.dbd: %Include.dbd
@$(RM) $(notdir $@)$(DEP)