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

Use EPICS_BASE_PVA_CORE_LIBS

Browse Source
This commit is contained in:
Andrew Johnson
2017-12-06 22:46:27 -06:00
parent e06b2b7076
commit b26c0ecd71
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile
View File

@ -5,7 +5,6 @@ include $(TOP)/configure/CONFIG
PVDATABASE_SRC = $(TOP)/src PVDATABASE_SRC = $(TOP)/src
LIBRARY += pvDatabase LIBRARY += pvDatabase
# shared library ABI version. # shared library ABI version.
@ -20,11 +19,7 @@ include $(PVDATABASE_SRC)/database/Makefile
include $(PVDATABASE_SRC)/pvAccess/Makefile include $(PVDATABASE_SRC)/pvAccess/Makefile
include $(PVDATABASE_SRC)/special/Makefile include $(PVDATABASE_SRC)/special/Makefile
pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
pvDatabase_LIBS += pvAccess pvAccessIOC pvData Com
pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS) pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
include $(TOP)/configure/RULES include $(TOP)/configure/RULES

6
test/Makefile
View File

@ -5,7 +5,9 @@ include $(TOP)/configure/CONFIG
PVDATABASE_TEST = $(TOP)/test PVDATABASE_TEST = $(TOP)/test
PROD_LIBS += pvDatabase pvAccess pvData Com PROD_LIBS += pvDatabase
PROD_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
include $(PVDATABASE_TEST)/src/Makefile include $(PVDATABASE_TEST)/src/Makefile
@ -24,5 +26,3 @@ TESTSPEC_RTEMS = rtemsTestHarness.$(MUNCH_SUFFIX); pvDatabaseAllTests
TESTSCRIPTS_HOST += $(TESTS:%=%.t) TESTSCRIPTS_HOST += $(TESTS:%=%.t)
include $(TOP)/configure/RULES include $(TOP)/configure/RULES