diff --git a/config/RULES.Host b/config/RULES.Host index c48f92d46..4fc65d8c3 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -193,10 +193,12 @@ ifdef DLLNAME INSTALL_DLLS=$(DLLNAME:%=$(INSTALL_BIN)/%) endif +INCREC +=$(RECTYPES) $(MENUS) INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%) INSTALL_INC= $(INC:%=$(INSTALL_INCLUDE)/%) INSTALL_OSINCLUDE=$(INSTALL_INCLUDE)/os/$(ARCH_CLASS) INSTALL_OSINC= $(OSINC:%= $(INSTALL_OSINCLUDE)/%) +INSTALL_INCREC = $(INCREC:%= $(INSTALL_INCLUDE)/%) MANLIST = 1 2 3 4 5 6 7 8 9 INSTALL_MANS = $(foreach n, \ $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) @@ -210,11 +212,18 @@ INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES) endif INSTALL_TEMPLATE = $(TEMPLATES:%= $(INSTALL_TEMPLATES_SUBDIR)/%) INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%) + +INSTALL_BPTS = $(BPTS:%= $(INSTALL_DBD)/%) +INSTALL_DBS = $(DBDINSTALL:%= $(INSTALL_DBD)/%)\ + $(RECTYPES:%.h= $(INSTALL_DBD)/%.dbd)\ + $(MENUS:%.h= $(INSTALL_DBD)/%.dbd) + +INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%) MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n)) DIRECTORY_TARGETS = $(INSTALL_INCLUDE) $(INSTALL_INCLUDE)/os \ - $(INSTALL_OSINCLUDE) $(INSTALL_DOC) \ + $(INSTALL_OSINCLUDE) $(INSTALL_DOC) $(INSTALL_DBD) \ $(INSTALL_LOCATION_BIN) $(INSTALL_BIN) $(INSTALL_LIB) \ $(INSTALL_LOCATION_LIB) $(INSTALL_CONFIG) \ $(MAN_DIRECTORY_TARGETS) $(INSTALL_MAN) \ @@ -250,7 +259,8 @@ endif # LIBRARY # all:: install -build:: $(LIBTARGETS) $(PROD) $(TESTPROD) +build:: $(LIBTARGETS) $(PROD) $(TESTPROD) \ + $(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME) inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) \ $(INSTALL_INCLUDE)/os $(INSTALL_OSINCLUDE) $(INSTALL_OSINC) @@ -265,7 +275,9 @@ buildInstall :: build $(TARGETS) $(INSTALL_LOCATION_BIN) \ $(INSTALL_DOC) $(INSTALL_DOCS) \ $(INSTALL_HTMLS) \ $(INSTALL_TEMPLATES) $(INSTALL_TEMPLATES_SUBDIR) $(INSTALL_TEMPLATE) \ - $(INSTALL_CONFIG) $(INSTALL_CONFIGS) + $(INSTALL_CONFIG) $(INSTALL_CONFIGS) \ + $(INSTALL_DBD) $(INSTALL_DBS) $(INSTALL_BPTS) \ + $(INSTALL_DBDNAME) $(INSTALL_INCREC) depends:: $(LIBSRCS) $(SRCS) $(RM) .DEPENDS @@ -435,6 +447,46 @@ endif $(MANGEN) -s $< $(MV) $( $@ + # rule for shareable (DLL- dynamic link library) creation $(DLLNAME): $(LIBOBJS) $(LINK.dll) $(LIBOBJS) $(DLL_LDLIBS) diff --git a/config/RULES.Unix b/config/RULES.Unix index 22ad695d5..3ff34bc34 100644 --- a/config/RULES.Unix +++ b/config/RULES.Unix @@ -1,10 +1,12 @@ # $Id$ +INCREC +=$(RECTYPES) $(MENUS) INSTALL_PROD = $(PROD:%= $(INSTALL_BIN)/%) INSTALL_LIBS = $(LIBNAME:%= $(INSTALL_LIB)/%) INSTALL_INC = $(INC:%= $(INSTALL_INCLUDE)/%) INSTALL_OSINCLUDE = $(INSTALL_INCLUDE)/os/$(T_A) INSTALL_OSINC = $(OSINC:%= $(INSTALL_OSINCLUDE)/%) +INSTALL_INCREC = $(INCREC:%= $(INSTALL_INCLUDE)/%) MANLIST = 1 2 3 4 5 6 7 8 9 INSTALL_MANS = $(foreach n, \ $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) @@ -15,6 +17,13 @@ INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) INSTALL_TEMPLATE = $(TEMPLATES:%= $(INSTALL_TEMPLATES_SUBDIR)/%) INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%) +INSTALL_BPTS = $(BPTS:%= $(INSTALL_DBD)/%) +INSTALL_DBS = $(DBDINSTALL:%= $(INSTALL_DBD)/%)\ + $(RECTYPES:%.h= $(INSTALL_DBD)/%.dbd)\ + $(MENUS:%.h= $(INSTALL_DBD)/%.dbd) + +INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%) + MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n)) DIRECTORY_TARGETS = $(INSTALL_INCLUDE) $(INSTALL_INCLUDE)/os \ @@ -30,7 +39,8 @@ pre_build:: rebuild:: clean install -build:: pre_build $(LIBNAME) $(TARGETS) $(PROD) +build:: pre_build $(LIBNAME) $(TARGETS) $(PROD)\ + $(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME) inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) $(INSTALL_INCLUDE)/os \ $(INSTALL_OSINCLUDE) $(INSTALL_OSINC) @@ -45,7 +55,9 @@ buildInstall :: build \ $(INSTALL_MAN) $(INSTALL_MANS) $(INSTALL_HTMLS) \ $(INSTALL_DOC) $(INSTALL_DOCS) $(INSTALL_TEMPLATES) \ $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) $(INSTALL_TEMPLATE) \ - $(INSTALL_CONFIG) $(INSTALL_CONFIGS) + $(INSTALL_CONFIG) $(INSTALL_CONFIGS) \ + $(INSTALL_DBD) $(INSTALL_DBS) $(INSTALL_BPTS) \ + $(INSTALL_DBDNAME) $(INSTALL_INCREC) depends:: $(SRCS.c) $(SRCS.cc) ifdef SRCS @@ -154,6 +166,46 @@ $(TARGETS) $(PROD): $(DEPLIBS) $(MANGEN) -s $< $(MV) $( $@ + $(LIBNAME): $(LIBOBJS) @echo Building library $@ $(RM) $@ diff --git a/src/bpt/Makefile.Host b/src/bpt/Makefile.Host index 50ed10509..c1d53d873 100644 --- a/src/bpt/Makefile.Host +++ b/src/bpt/Makefile.Host @@ -1,6 +1,3 @@ -# Makefile.Host for base/src/bpt -# - TOP = ../../.. include $(TOP)/config/CONFIG_BASE @@ -9,6 +6,14 @@ INC := cvtTable.h SRCS := makeBpt.c PROD := makeBpt +MENUS += menuConvert.h + +BPTS += bptTypeJdegC.dbd +BPTS += bptTypeJdegF.dbd +BPTS += bptTypeKdegC.dbd +BPTS += bptTypeKdegF.dbd + include $(TOP)/config/RULES.Host -# EOF Makefile.Host for base/src/bpt +$(BPTS): $(INSTALL_PROD) + diff --git a/src/db/Makefile.Host b/src/db/Makefile.Host index 8c3110d54..cf9280394 100644 --- a/src/db/Makefile.Host +++ b/src/db/Makefile.Host @@ -27,5 +27,29 @@ INC += recGbl.h INC += dbBkpt.h INC += devLib.h +MENUS += menuAlarmSevr.h +MENUS += menuAlarmStat.h +MENUS += menuArrType.h +MENUS += menuCompress.h +MENUS += menuFtype.h +MENUS += menuIvoa.h +MENUS += menuLinr.h +MENUS += menuOmsl.h +MENUS += menuPriority.h +MENUS += menuScan.h +MENUS += menuYesNo.h + +RECTYPES += dbCommon.h +USER_DBDFLAGS += -I .. + +DBDINSTALL += dbCommonRecord.dbd +DBDINSTALL += menuGlobal.dbd +DBDINSTALL += base.dbd +DBDINSTALL += baseLIBOBJS + include $(TOP)/config/RULES.Host +dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd + $(RM) $@ + $(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH \ + $(USER_DBDFLAGS) $< diff --git a/src/rec/Makefile.Host b/src/rec/Makefile.Host new file mode 100644 index 000000000..c9788f389 --- /dev/null +++ b/src/rec/Makefile.Host @@ -0,0 +1,54 @@ +TOP = ../../.. +include $(TOP)/config/CONFIG_BASE + +INC += egDefs.h +INC += erDefs.h +INC += ereventDefs.h +INC += recDynLink.h + +USER_DBDFLAGS += -I .. -I $(EPICS_BASE)/dbd +RECTYPES += aaiRecord.h +RECTYPES += aaoRecord.h +RECTYPES += aiRecord.h +RECTYPES += aoRecord.h +RECTYPES += biRecord.h +RECTYPES += boRecord.h +RECTYPES += calcRecord.h +RECTYPES += calcoutRecord.h +RECTYPES += compressRecord.h +RECTYPES += dfanoutRecord.h +RECTYPES += egRecord.h +RECTYPES += egeventRecord.h +RECTYPES += erRecord.h +RECTYPES += ereventRecord.h +RECTYPES += eventRecord.h +RECTYPES += fanoutRecord.h +RECTYPES += gsubRecord.h +RECTYPES += histogramRecord.h +RECTYPES += longinRecord.h +RECTYPES += longoutRecord.h +RECTYPES += mbbiRecord.h +RECTYPES += mbbiDirectRecord.h +RECTYPES += mbboRecord.h +RECTYPES += mbboDirectRecord.h +RECTYPES += palRecord.h +RECTYPES += permissiveRecord.h +RECTYPES += pidRecord.h +RECTYPES += pulseCounterRecord.h +RECTYPES += pulseDelayRecord.h +RECTYPES += pulseTrainRecord.h +RECTYPES += scanRecord.h +RECTYPES += selRecord.h +RECTYPES += seqRecord.h +RECTYPES += stateRecord.h +RECTYPES += steppermotorRecord.h +RECTYPES += stringinRecord.h +RECTYPES += stringoutRecord.h +RECTYPES += subRecord.h +RECTYPES += subArrayRecord.h +RECTYPES += timerRecord.h +RECTYPES += waitRecord.h +RECTYPES += waveformRecord.h + +include $(TOP)/config/RULES.Host +