change qsrv library name

This commit is contained in:
Michael Davidsaver
2017-09-12 10:04:32 -05:00
parent 8575c924fb
commit ea088a7502
2 changed files with 14 additions and 14 deletions
+10 -10
View File
@@ -5,22 +5,22 @@ include $(TOP)/configure/CONFIG
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================
LIBRARY_HOST += pdbcore
LIBRARY_HOST += qsrv
USR_CPPFLAGS += -I$(TOP)/common -I$(TOP)/p2pApp
pdbcore_SRCS += pvif.cpp
pdbcore_SRCS += qsrv.cpp
pdbcore_SRCS += pdb.cpp
pdbcore_SRCS += pdbsingle.cpp
#pdbcore_SRCS += pvalink.cpp
pdbcore_SRCS += demo.cpp
qsrv_SRCS += pvif.cpp
qsrv_SRCS += qsrv.cpp
qsrv_SRCS += pdb.cpp
qsrv_SRCS += pdbsingle.cpp
#qsrv_SRCS += pvalink.cpp
qsrv_SRCS += demo.cpp
ifdef BASE_3_16
pdbcore_SRCS += pdbgroup.cpp
qsrv_SRCS += pdbgroup.cpp
endif
pdbcore_LIBS += pvAccess pvData Com
qsrv_LIBS += pvAccess pvData Com
FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
@@ -31,7 +31,7 @@ PROD_IOC += softIocPVA
softIocPVA_SRCS += softMain.cpp
softIocPVA_SRCS += softIocPVA_registerRecordDeviceDriver.cpp
softIocPVA_LIBS += pdbcore pvAccessIOC pvAccess pvData $(MBLIB)
softIocPVA_LIBS += qsrv pvAccessIOC pvAccess pvData $(MBLIB)
softIocPVA_LIBS += $(EPICS_BASE_IOC_LIBS)
DBD += softIocPVA.dbd
+4 -4
View File
@@ -14,7 +14,7 @@ p2pTestIoc_DBD += base.dbd
# Tests explicitly create/destory PDB provider
#p2pTestIoc_DBD += qsrv.dbd
LIBRARY += testutils
TESTLIBRARY += testutils
testutils_SRCS += utilities.cpp
testutils_LIBS += pvAccess pvData Com
@@ -43,13 +43,13 @@ TESTS += testmon
TESTPROD_HOST += testpvif
testpvif_SRCS += testpvif.cpp
testpvif_SRCS += p2pTestIoc_registerRecordDeviceDriver.cpp
testpvif_LIBS += pdbcore pvAccess pvData $(EPICS_BASE_IOC_LIBS)
testpvif_LIBS += qsrv pvAccess pvData $(EPICS_BASE_IOC_LIBS)
TESTS += testpvif
TESTPROD_HOST += testpdb
testpdb_SRCS += testpdb.cpp
testpdb_SRCS += p2pTestIoc_registerRecordDeviceDriver.cpp
testpdb_LIBS += testutils pdbcore pvAccess pvData $(EPICS_BASE_IOC_LIBS)
testpdb_LIBS += testutils qsrv pvAccess pvData $(EPICS_BASE_IOC_LIBS)
TESTS += testpdb
PROD_HOST += check_consist
@@ -59,7 +59,7 @@ check_consist_LIBS += testutils pvAccess pvData Com
#TESTPROD_HOST += testpvalink
testpvalink_SRCS += testpvalink.cpp
testpvalink_SRCS += p2pTestIoc_registerRecordDeviceDriver.cpp
testpvalink_LIBS += testutils pdbcore pvAccess pvData $(EPICS_BASE_IOC_LIBS)
testpvalink_LIBS += testutils qsrv pvAccess pvData $(EPICS_BASE_IOC_LIBS)
#TESTS += testpvalink
TESTSCRIPTS_HOST += $(TESTS:%=%.t)