From 0595b5a9d532f7a72d4c4362d77a1d35664fba96 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Tue, 2 Feb 2016 13:00:51 -0500 Subject: [PATCH] for installing in include/pv follow pvaClientCPP --- configure/CONFIG_SITE | 3 --- src/Makefile | 12 +++++++----- src/pv/Makefile | 5 ----- 3 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 src/pv/Makefile diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 9558af5..5d79a17 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -20,8 +20,5 @@ # INSTALL_LOCATION here. #INSTALL_LOCATION= -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I $(INSTALL_LOCATION)/include - -include $(TOP)/../CONFIG_SITE.local -include $(TOP)/configure/CONFIG_SITE.local diff --git a/src/Makefile b/src/Makefile index e205b58..2681c3f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,17 +3,19 @@ TOP = .. include $(TOP)/configure/CONFIG -INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv -USR_INCLUDES += -I$(INSTALL_LOCATION)/include - PVDATABASE_SRC = $(TOP)/src -include $(PVDATABASE_SRC)/pv/Makefile + +LIBRARY += pvDatabase + +INC += pv/channelProviderLocal.h +INC += pv/pvDatabase.h +INC += pv/traceRecord.h + include $(PVDATABASE_SRC)/database/Makefile include $(PVDATABASE_SRC)/pvAccess/Makefile include $(PVDATABASE_SRC)/special/Makefile -LIBRARY += pvDatabase pvDatabase_LIBS += pvAccess pvData Com pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS) diff --git a/src/pv/Makefile b/src/pv/Makefile deleted file mode 100644 index 5480c95..0000000 --- a/src/pv/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -SRC_DIRS += $(PVDATABASE_SRC)/pv -INC += pvDatabase.h -INC += channelProviderLocal.h -INC += traceRecord.h -