From e51c29d1471dc35d9a166c7a7a13f1c972b049e1 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Fri, 2 Apr 2021 07:00:59 -0400 Subject: [PATCH] attempt to fix jenkins_problem --- src/Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Makefile b/src/Makefile index e0cb91c..d3b9feb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,15 +3,8 @@ TOP = .. include $(TOP)/configure/CONFIG -# needed for Windows -LIB_SYS_LIBS_WIN32 += netapi32 ws2_32 - PVDATABASE_SRC = $(TOP)/src -LIBRARY += pvDatabase - -# shared library ABI version. -SHRLIB_VERSION ?= $(EPICS_PVDATABASE_MAJOR_VERSION).$(EPICS_PVDATABASE_MINOR_VERSION).$(EPICS_PVDATABASE_MAINTENANCE_VERSION) INC += pv/pvPlugin.h INC += pv/pvStructureCopy.h @@ -34,7 +27,18 @@ include $(PVDATABASE_SRC)/pvAccess/Makefile include $(PVDATABASE_SRC)/special/Makefile include $(PVDATABASE_SRC)/support/Makefile -pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) -pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS) +LIBRARY += pvDatabase +pvDatabase_LIBS += pvData +pvDatabase_LIBS += pvAccess +LIB_LIBS += Com + +# shared library ABI version. +SHRLIB_VERSION ?= $(EPICS_PVDATABASE_MAJOR_VERSION).$(EPICS_PVDATABASE_MINOR_VERSION).$(EPICS_PVDATABASE_MAINTENANCE_VERSION) + +# needed for Windows +LIB_SYS_LIBS_WIN32 += netapi32 ws2_32 + +#pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) +#pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS) include $(TOP)/configure/RULES