merge feature/changesAfter3_0_2; resolve conflicts

2014-06-10 15:53:37 -04:00
parent 35429bf4df
commit 92be294bbf
87 changed files with 561 additions and 445 deletions
@@ -0,0 +1,45 @@
+TOP = ..
+include $(TOP)/configure/CONFIG
+
+LIBRARY_IOC += pvDatabaseExample
+pvDatabaseExample_LIBS += pvDatabase pvAccess pvData Com
+pvDatabaseExample_LIBS += $(EPICS_BASE_IOC_LIBS)
+
+
+INC+= arrayPerformance.h
+LIBSRCS += arrayPerformance.cpp
+INC+= longArrayMonitor.h
+LIBSRCS += longArrayMonitor.cpp
+INC+= longArrayGet.h
+LIBSRCS += longArrayGet.cpp
+INC+= longArrayPut.h
+LIBSRCS += longArrayPut.cpp
+
+PROD_HOST += arrayPerformanceMain
+arrayPerformanceMain_SRCS += arrayPerformanceMain.cpp
+arrayPerformanceMain_LIBS += pvDatabase pvAccess pvData Com
+arrayPerformanceMain_LIBS += pvDatabaseExample
+
+PROD_HOST += longArrayMonitorMain
+longArrayMonitorMain_SRCS += longArrayMonitorMain.cpp
+longArrayMonitorMain_LIBS += pvDatabase pvAccess pvData Com
+longArrayMonitorMain_LIBS += pvDatabaseExample
+
+PROD_HOST += longArrayGetMain
+longArrayGetMain_SRCS += longArrayGetMain.cpp
+longArrayGetMain_LIBS += pvDatabase pvAccess pvData Com
+longArrayGetMain_LIBS += pvDatabaseExample
+
+PROD_HOST += longArrayPutMain
+longArrayPutMain_SRCS += longArrayPutMain.cpp
+longArrayPutMain_LIBS += pvDatabase pvAccess pvData Com
+longArrayPutMain_LIBS += pvDatabaseExample
+
+PROD_HOST += vectorPerformanceMain
+vectorPerformanceMain_SRCS += vectorPerformanceMain.cpp
+vectorPerformanceMain_LIBS += pvDatabase pvAccess pvData Com
+vectorPerformanceMain_LIBS += pvDatabaseExample
+
+
+include $(TOP)/configure/RULES
+