From 86a5e037fa598c0ef791fe815c2550d86d37fc40 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 1 Feb 2016 16:34:35 -0500 Subject: [PATCH 1/2] move headers to pv/ --- src/{ => pv}/pvaClient.h | 0 src/{ => pv}/pvaClientMultiChannel.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/{ => pv}/pvaClient.h (100%) rename src/{ => pv}/pvaClientMultiChannel.h (100%) diff --git a/src/pvaClient.h b/src/pv/pvaClient.h similarity index 100% rename from src/pvaClient.h rename to src/pv/pvaClient.h diff --git a/src/pvaClientMultiChannel.h b/src/pv/pvaClientMultiChannel.h similarity index 100% rename from src/pvaClientMultiChannel.h rename to src/pv/pvaClientMultiChannel.h From 9a9bf34f83dc906c394fd4f6331c39d387e366eb Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 1 Feb 2016 16:34:57 -0500 Subject: [PATCH 2/2] update Makefiles --- configure/CONFIG_SITE | 3 --- src/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) 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 5a278f5..e9af681 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,8 +5,8 @@ include $(TOP)/configure/CONFIG LIBRARY += pvaClient -INC += pvaClient.h -INC += pvaClientMultiChannel.h +INC += pv/pvaClient.h +INC += pv/pvaClientMultiChannel.h LIBSRCS += pvaClient.cpp LIBSRCS += pvaClientPutData.cpp