Merge branch 'ICSHWI-18047-fixes' into ICSHWI-18047-set-channels

To fix problems suggested in discussion: !4

vmmTbl.Makefile

@@ -7,15 +7,24 @@ APP:=vmmTblApp
 APPDB:=$(APP)/Db
 APPSRC:=$(APP)/src
 
-TMPS += $(APPDB)/channels.template
+TMPS += $(APPDB)/hybrid.template
+TMPS += $(APPDB)/vmm_tbl.template
 SUBS = $(APPDB)/channels.sub
 
 SOURCES += $(wildcard $(APPSRC)/*.cpp)
-HEADERS += $(wildcard $(APPSRC)/*.h)
+SOURCES += $(APPSRC)/hybrid.cpp
+SOURCES += $(APPSRC)/vmm3a.cpp
+SOURCES += $(APPSRC)/vmm_config.cpp
+SOURCES += $(APPSRC)/vmm_tbl.cpp
+SOURCES += $(APPSRC)/vmm_tbl_regs_map.cpp
+HEADERS += $(APPSRC)/hybrid.h
+HEADERS += $(APPSRC)/vmm3a.h
+HEADERS += $(APPSRC)/vmm_config.h
+HEADERS += $(APPSRC)/vmm_params.h
+HEADERS += $(APPSRC)/vmm_tbl.h
+HEADERS += $(APPSRC)/vmm_tbl_regs_map.h
 DBDS    += $(APPSRC)/vmm_tbl.dbd
 
-TMPS=$(wildcard $(APPDB)/*.template)
-
 USR_DBFLAGS += -I . -I ..
 USR_DBFLAGS += -I $(EPICS_BASE)/db
 USR_DBFLAGS += -I $(APPDB)