Move example and test headers out of include/pv

The only headers installed there should be
those for the official API of the module.

arrayPerformance/src/arrayPerformance.cpp

@@ -10,7 +10,8 @@
  */
 
 #include <pv/lock.h>
-#include <pv/arrayPerformance.h>
+
+#include <arrayPerformance.h>
 
 namespace epics { namespace pvDatabase { 
 

arrayPerformance/src/arrayPerformanceMain.cpp

@@ -22,13 +22,14 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/arrayPerformance.h>
-#include <pv/longArrayMonitor.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
 
+#include <arrayPerformance.h>
+#include <longArrayMonitor.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

arrayPerformance/src/longArrayGet.cpp

@@ -10,9 +10,10 @@
  */
 
 #include <epicsThread.h>
-#include <pv/longArrayGet.h>
 #include <pv/caProvider.h>
 
+#include <longArrayGet.h>
+
 namespace epics { namespace pvDatabase { 
 
 using namespace epics::pvData;

arrayPerformance/src/longArrayGetMain.cpp

@@ -22,13 +22,14 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/arrayPerformance.h>
-#include <pv/longArrayGet.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
 
+#include <arrayPerformance.h>
+#include <longArrayGet.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

arrayPerformance/src/longArrayMonitor.cpp

@@ -10,9 +10,10 @@
  */
 
 #include <epicsThread.h>
-#include <pv/longArrayMonitor.h>
 #include <pv/caProvider.h>
 
+#include <longArrayMonitor.h>
+
 namespace epics { namespace pvDatabase { 
 
 using namespace epics::pvData;

arrayPerformance/src/longArrayMonitorMain.cpp

@@ -22,13 +22,14 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/arrayPerformance.h>
-#include <pv/longArrayMonitor.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
 
+#include <arrayPerformance.h>
+#include <longArrayMonitor.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

arrayPerformance/src/longArrayPut.cpp

@@ -10,9 +10,10 @@
  */
 
 #include <epicsThread.h>
-#include <pv/longArrayPut.h>
 #include <pv/caProvider.h>
 
+#include <longArrayPut.h>
+
 namespace epics { namespace pvDatabase { 
 
 using namespace epics::pvData;

arrayPerformance/src/longArrayPutMain.cpp

@@ -22,13 +22,14 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/arrayPerformance.h>
-#include <pv/longArrayPut.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
 
+#include <arrayPerformance.h>
+#include <longArrayPut.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

exampleDatabase/src/Makefile

@@ -23,7 +23,7 @@ DBD += exampleDatabase.dbd
 
 INC += exampleDatabase.h
 
-LIBRARY_IOC += exampleDatabase
+LIBRARY += exampleDatabase
 exampleDatabase_SRCS += exampleDatabase.cpp
 exampleDatabase_SRCS += exampleDatabaseRegister.cpp
 exampleDatabase_LIBS += pvDatabase

exampleDatabase/src/exampleDatabase.cpp

@@ -22,11 +22,12 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/powerSupply.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/recordList.h>
 #include <pv/traceRecord.h>
-#include <pv/exampleDatabase.h>
+
+#include <powerSupply.h>
+#include <exampleDatabase.h>
 
 using namespace std;
 using std::tr1::static_pointer_cast;

exampleDatabase/src/exampleDatabaseMain.cpp

@@ -20,9 +20,10 @@
 #include <iostream>
 
 #include <pv/channelProviderLocal.h>
-#include <pv/exampleDatabase.h>
 #include <pv/serverContext.h>
 
+#include <exampleDatabase.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

exampleDatabase/src/exampleDatabaseRegister.cpp

@@ -26,13 +26,14 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-#include <pv/exampleDatabase.h>
+
+#include <epicsExport.h>
+
+#include <exampleDatabase.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

exampleLink/src/exampleLink.cpp

@@ -9,10 +9,11 @@
  * @date 2013.08.02
  */
 
-#include <pv/exampleLink.h>
 #include <pv/standardPVField.h>
 #include <pv/convert.h>
 
+#include <exampleLink.h>
+
 namespace epics { namespace pvDatabase { 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

exampleLink/src/exampleLinkRegister.cpp

@@ -27,15 +27,16 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-#include <pv/exampleLink.h>
+
+#include <epicsExport.h>
+
+#include <exampleLink.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

examplePowerSupply/src/powerSupplyMain.cpp

@@ -20,11 +20,12 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/powerSupply.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 
+#include <powerSupply.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

exampleServer/src/exampleServer.cpp

@@ -10,7 +10,8 @@
  */
 
 #include <pv/standardPVField.h>
-#include <pv/exampleServer.h>
+
+#include <exampleServer.h>
 
 namespace epics { namespace exampleServer { 
 using namespace epics::pvData;

exampleServer/src/exampleServerMain.cpp

@@ -20,11 +20,12 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/exampleServer.h>
 #include <pv/traceRecord.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/serverContext.h>
 
+#include <exampleServer.h>
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

exampleServer/src/exampleServerRegister.cpp

@@ -27,13 +27,14 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-#include <pv/exampleServer.h>
+
+#include <epicsExport.h>
+
+#include <exampleServer.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/Makefile

@@ -3,9 +3,12 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I$(INSTALL_LOCATION)/include
+
 PVDATABASE_SRC = $(TOP)/src
 
-LIBRARY_IOC += pvDatabase
+LIBRARY += pvDatabase
 
 include $(PVDATABASE_SRC)/database/Makefile
 include $(PVDATABASE_SRC)/pvAccess/Makefile
@@ -15,3 +18,4 @@ pvDatabase_LIBS += pvAccess pvData Com
 pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 include $(TOP)/configure/RULES
+

test/src/powerSupplyRegister.cpp

@@ -27,13 +27,14 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
-#include <epicsExport.h>
-
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-#include <pv/powerSupply.h>
+
+#include <epicsExport.h>
+
+#include <powerSupply.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;