epics-base · mdavidsaver · Dec 18, 2015 · Dec 18, 2015 · Dec 18, 2015
diff --git a/src/Makefile b/src/Makefile
@@ -3,9 +3,6 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I$(INSTALL_LOCATION)/include
-
 PVDATA_SRC = $(TOP)/src
 
 include $(PVDATA_SRC)/misc/Makefile

diff --git a/src/copy/Makefile b/src/copy/Makefile
@@ -2,8 +2,8 @@
 
 SRC_DIRS += $(PVDATA_SRC)/copy
 
-INC += createRequest.h
-INC += pvCopy.h
+INC += pv/createRequest.h
+INC += pv/pvCopy.h
 
 LIBSRCS += createRequest.cpp
 LIBSRCS += pvCopy.cpp
diff --git a/src/copy/createRequest.h → src/copy/pv/createRequest.h b/src/copy/createRequest.h → src/copy/pv/createRequest.h
diff --git a/src/copy/pvCopy.h → src/copy/pv/pvCopy.h b/src/copy/pvCopy.h → src/copy/pv/pvCopy.h
diff --git a/src/factory/Makefile b/src/factory/Makefile
@@ -2,7 +2,7 @@
 
 SRC_DIRS += $(PVDATA_SRC)/factory
 
-INC += factory.h
+INC += pv/factory.h
 LIBSRCS += TypeFunc.cpp
 LIBSRCS += FieldCreateFactory.cpp
 LIBSRCS += PVField.cpp

diff --git a/src/factory/factory.h → src/factory/pv/factory.h b/src/factory/factory.h → src/factory/pv/factory.h
diff --git a/src/misc/Makefile b/src/misc/Makefile
@@ -2,29 +2,29 @@
 
 SRC_DIRS += $(PVDATA_SRC)/misc
 
-INC += noDefaultMethods.h
-INC += lock.h
-INC += requester.h
-INC += serialize.h
-INC += bitSet.h
-INC += byteBuffer.h
-INC += epicsException.h
-INC += serializeHelper.h
-INC += event.h
-INC += thread.h
-INC += executor.h
-INC += timeFunction.h
-INC += timer.h
-INC += queue.h
-INC += messageQueue.h
-INC += destroyable.h
-INC += status.h
-INC += sharedPtr.h
-INC += localStaticLock.h
-INC += typeCast.h
-INC += sharedVector.h
-INC += templateMeta.h
-INC += current_function.h
+INC += pv/noDefaultMethods.h
+INC += pv/lock.h
+INC += pv/requester.h
+INC += pv/serialize.h
+INC += pv/bitSet.h
+INC += pv/byteBuffer.h
+INC += pv/epicsException.h
+INC += pv/serializeHelper.h
+INC += pv/event.h
+INC += pv/thread.h
+INC += pv/executor.h
+INC += pv/timeFunction.h
+INC += pv/timer.h
+INC += pv/queue.h
+INC += pv/messageQueue.h
+INC += pv/destroyable.h
+INC += pv/status.h
+INC += pv/sharedPtr.h
+INC += pv/localStaticLock.h
+INC += pv/typeCast.h
+INC += pv/sharedVector.h
+INC += pv/templateMeta.h
+INC += pv/current_function.h
 
 LIBSRCS += byteBuffer.cpp
 LIBSRCS += bitSet.cpp

diff --git a/src/misc/parseToPOD.cpp b/src/misc/parseToPOD.cpp
@@ -12,7 +12,7 @@
 #include <epicsConvert.h>
 
 #define epicsExportSharedSymbols
-#include "typeCast.h"
+#include "pv/typeCast.h"
 
 using std::string;
 

diff --git a/src/misc/bitSet.h → src/misc/pv/bitSet.h b/src/misc/bitSet.h → src/misc/pv/bitSet.h
diff --git a/src/misc/byteBuffer.h → src/misc/pv/byteBuffer.h b/src/misc/byteBuffer.h → src/misc/pv/byteBuffer.h
diff --git a/src/misc/current_function.h → src/misc/pv/current_function.h b/src/misc/current_function.h → src/misc/pv/current_function.h
diff --git a/src/misc/destroyable.h → src/misc/pv/destroyable.h b/src/misc/destroyable.h → src/misc/pv/destroyable.h
diff --git a/src/misc/epicsException.h → src/misc/pv/epicsException.h b/src/misc/epicsException.h → src/misc/pv/epicsException.h
diff --git a/src/misc/event.h → src/misc/pv/event.h b/src/misc/event.h → src/misc/pv/event.h
diff --git a/src/misc/executor.h → src/misc/pv/executor.h b/src/misc/executor.h → src/misc/pv/executor.h
diff --git a/src/misc/localStaticLock.h → src/misc/pv/localStaticLock.h b/src/misc/localStaticLock.h → src/misc/pv/localStaticLock.h
diff --git a/src/misc/lock.h → src/misc/pv/lock.h b/src/misc/lock.h → src/misc/pv/lock.h
diff --git a/src/misc/messageQueue.h → src/misc/pv/messageQueue.h b/src/misc/messageQueue.h → src/misc/pv/messageQueue.h
diff --git a/src/misc/noDefaultMethods.h → src/misc/pv/noDefaultMethods.h b/src/misc/noDefaultMethods.h → src/misc/pv/noDefaultMethods.h
diff --git a/src/misc/queue.h → src/misc/pv/queue.h b/src/misc/queue.h → src/misc/pv/queue.h
diff --git a/src/misc/requester.h → src/misc/pv/requester.h b/src/misc/requester.h → src/misc/pv/requester.h
diff --git a/src/misc/serialize.h → src/misc/pv/serialize.h b/src/misc/serialize.h → src/misc/pv/serialize.h
diff --git a/src/misc/serializeHelper.h → src/misc/pv/serializeHelper.h b/src/misc/serializeHelper.h → src/misc/pv/serializeHelper.h
diff --git a/src/misc/sharedPtr.h → src/misc/pv/sharedPtr.h b/src/misc/sharedPtr.h → src/misc/pv/sharedPtr.h
diff --git a/src/misc/sharedVector.h → src/misc/pv/sharedVector.h b/src/misc/sharedVector.h → src/misc/pv/sharedVector.h
diff --git a/src/misc/status.h → src/misc/pv/status.h b/src/misc/status.h → src/misc/pv/status.h
diff --git a/src/misc/templateMeta.h → src/misc/pv/templateMeta.h b/src/misc/templateMeta.h → src/misc/pv/templateMeta.h
diff --git a/src/misc/thread.h → src/misc/pv/thread.h b/src/misc/thread.h → src/misc/pv/thread.h
diff --git a/src/misc/timeFunction.h → src/misc/pv/timeFunction.h b/src/misc/timeFunction.h → src/misc/pv/timeFunction.h
diff --git a/src/misc/timer.h → src/misc/pv/timer.h b/src/misc/timer.h → src/misc/pv/timer.h
diff --git a/src/misc/typeCast.h → src/misc/pv/typeCast.h b/src/misc/typeCast.h → src/misc/pv/typeCast.h
diff --git a/src/misc/typeCast.cpp b/src/misc/typeCast.cpp
@@ -8,7 +8,7 @@
 #include <sstream>
 
 #define epicsExportSharedSymbols
-#include "typeCast.h"
+#include "pv/typeCast.h"
 
 using epics::pvData::castUnsafe;
 using epics::pvData::ScalarType;

diff --git a/src/monitor/Makefile b/src/monitor/Makefile
@@ -2,8 +2,8 @@
 
 SRC_DIRS += $(PVDATA_SRC)/monitor
 
-INC += monitor.h
-INC += monitorPlugin.h
+INC += pv/monitor.h
+INC += pv/monitorPlugin.h
 
 LIBSRCS += monitor.cpp
-LIBSRCS += monitorPlugin.cpp
+LIBSRCS += monitorPlugin.cpp
diff --git a/src/monitor/monitor.h → src/monitor/pv/monitor.h b/src/monitor/monitor.h → src/monitor/pv/monitor.h
diff --git a/src/monitor/monitorPlugin.h → src/monitor/pv/monitorPlugin.h b/src/monitor/monitorPlugin.h → src/monitor/pv/monitorPlugin.h
diff --git a/src/property/Makefile b/src/property/Makefile
@@ -2,15 +2,15 @@
 
 SRC_DIRS += $(PVDATA_SRC)/property
 
-INC += alarm.h
-INC += pvAlarm.h
-INC += control.h
-INC += pvControl.h
-INC += display.h
-INC += pvDisplay.h
-INC += pvEnumerated.h
-INC += timeStamp.h
-INC += pvTimeStamp.h
+INC += pv/alarm.h
+INC += pv/pvAlarm.h
+INC += pv/control.h
+INC += pv/pvControl.h
+INC += pv/display.h
+INC += pv/pvDisplay.h
+INC += pv/pvEnumerated.h
+INC += pv/timeStamp.h
+INC += pv/pvTimeStamp.h
 
 LIBSRCS += alarm.cpp
 LIBSRCS += pvAlarm.cpp

diff --git a/src/property/alarm.h → src/property/pv/alarm.h b/src/property/alarm.h → src/property/pv/alarm.h
diff --git a/src/property/control.h → src/property/pv/control.h b/src/property/control.h → src/property/pv/control.h
diff --git a/src/property/display.h → src/property/pv/display.h b/src/property/display.h → src/property/pv/display.h
diff --git a/src/property/pvAlarm.h → src/property/pv/pvAlarm.h b/src/property/pvAlarm.h → src/property/pv/pvAlarm.h
diff --git a/src/property/pvControl.h → src/property/pv/pvControl.h b/src/property/pvControl.h → src/property/pv/pvControl.h
diff --git a/src/property/pvDisplay.h → src/property/pv/pvDisplay.h b/src/property/pvDisplay.h → src/property/pv/pvDisplay.h
diff --git a/src/property/pvEnumerated.h → src/property/pv/pvEnumerated.h b/src/property/pvEnumerated.h → src/property/pv/pvEnumerated.h
diff --git a/src/property/pvTimeStamp.h → src/property/pv/pvTimeStamp.h b/src/property/pvTimeStamp.h → src/property/pv/pvTimeStamp.h
diff --git a/src/property/timeStamp.h → src/property/pv/timeStamp.h b/src/property/timeStamp.h → src/property/pv/timeStamp.h
diff --git a/src/pv/Makefile b/src/pv/Makefile
@@ -2,11 +2,11 @@
 
 SRC_DIRS += $(PVDATA_SRC)/pv
 
-INC += pvType.h
-INC += pvIntrospect.h
-INC += pvData.h
-INC += convert.h
-INC += standardField.h
-INC += standardPVField.h
-INC += pvSubArrayCopy.h
+INC += pv/pvType.h
+INC += pv/pvIntrospect.h
+INC += pv/pvData.h
+INC += pv/convert.h
+INC += pv/standardField.h
+INC += pv/standardPVField.h
+INC += pv/pvSubArrayCopy.h
 
diff --git a/src/pvMisc/Makefile b/src/pvMisc/Makefile
@@ -2,7 +2,7 @@
 
 SRC_DIRS += $(PVDATA_SRC)/pvMisc
 
-INC += bitSetUtil.h
+INC += pv/bitSetUtil.h
 
 LIBSRCS += bitSetUtil.cpp
 
diff --git a/src/pvMisc/bitSetUtil.h → src/pvMisc/pv/bitSetUtil.h b/src/pvMisc/bitSetUtil.h → src/pvMisc/pv/bitSetUtil.h
diff --git a/testApp/rtemsNetworking.h → testApp/pv/rtemsNetworking.h b/testApp/rtemsNetworking.h → testApp/pv/rtemsNetworking.h