Merge pull request #7 from mdavidsaver/master

Move headers to pv/
2016-02-10 20:45:01 +00:00
parent eb440e4662 4f3f6784d4
commit f90549aba8
60 changed files with 99 additions and 111 deletions
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@ -29,9 +29,6 @@ USR_CPPFLAGS += --coverage
 USR_LDFLAGS += --coverage
 endif

-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
 -include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local

--- a/src/Makefile
+++ b/src/Makefile
@ -1,30 +1,26 @@
 TOP = ..
 include $(TOP)/configure/CONFIG

-SRC = $(TOP)/src
-
-SRC_DIRS += $(SRC)/nt
-
-INC += nt.h
-INC += ntutils.h
-INC += ntid.h
-INC += ntfield.h
-INC += ntscalar.h
-INC += ntscalarArray.h
-INC += ntnameValue.h
-INC += nttable.h
-INC += ntmultiChannel.h
-INC += ntscalarMultiChannel.h
-INC += ntndarray.h
-INC += ntmatrix.h
-INC += ntenum.h
-INC += ntunion.h
-INC += ntaggregate.h
-INC += ntattribute.h
-INC += ntcontinuum.h
-INC += nthistogram.h
-INC += nturi.h
-INC += ntndarrayAttribute.h
+INC += pv/nt.h
+INC += pv/ntutils.h
+INC += pv/ntid.h
+INC += pv/ntfield.h
+INC += pv/ntscalar.h
+INC += pv/ntscalarArray.h
+INC += pv/ntnameValue.h
+INC += pv/nttable.h
+INC += pv/ntmultiChannel.h
+INC += pv/ntscalarMultiChannel.h
+INC += pv/ntndarray.h
+INC += pv/ntmatrix.h
+INC += pv/ntenum.h
+INC += pv/ntunion.h
+INC += pv/ntaggregate.h
+INC += pv/ntattribute.h
+INC += pv/ntcontinuum.h
+INC += pv/nthistogram.h
+INC += pv/nturi.h
+INC += pv/ntndarrayAttribute.h

 LIBSRCS += ntutils.cpp
 LIBSRCS += ntid.cpp
--- a/src/nt/ntaggregate.cpp
+++ b/src/nt/ntaggregate.cpp
--- a/src/nt/ntattribute.cpp
+++ b/src/nt/ntattribute.cpp
--- a/src/nt/ntcontinuum.cpp
+++ b/src/nt/ntcontinuum.cpp
--- a/src/nt/ntenum.cpp
+++ b/src/nt/ntenum.cpp
--- a/src/nt/ntfield.cpp
+++ b/src/nt/ntfield.cpp
--- a/src/nt/nthistogram.cpp
+++ b/src/nt/nthistogram.cpp
--- a/src/nt/ntid.cpp
+++ b/src/nt/ntid.cpp
--- a/src/nt/ntmatrix.cpp
+++ b/src/nt/ntmatrix.cpp
--- a/src/nt/ntmultiChannel.cpp
+++ b/src/nt/ntmultiChannel.cpp
--- a/src/nt/ntnameValue.cpp
+++ b/src/nt/ntnameValue.cpp
--- a/src/nt/ntndarray.cpp
+++ b/src/nt/ntndarray.cpp
--- a/src/nt/ntndarrayAttribute.cpp
+++ b/src/nt/ntndarrayAttribute.cpp
--- a/src/nt/ntscalar.cpp
+++ b/src/nt/ntscalar.cpp
--- a/src/nt/ntscalarArray.cpp
+++ b/src/nt/ntscalarArray.cpp
--- a/src/nt/ntscalarMultiChannel.cpp
+++ b/src/nt/ntscalarMultiChannel.cpp
--- a/src/nt/nttable.cpp
+++ b/src/nt/nttable.cpp
--- a/src/nt/ntunion.cpp
+++ b/src/nt/ntunion.cpp
--- a/src/nt/nturi.cpp
+++ b/src/nt/nturi.cpp
--- a/src/nt/ntutils.cpp
+++ b/src/nt/ntutils.cpp
--- a/src/pv/nt.h
+++ b/src/pv/nt.h
--- a/src/pv/ntaggregate.h
+++ b/src/pv/ntaggregate.h
--- a/src/pv/ntattribute.h
+++ b/src/pv/ntattribute.h
--- a/src/pv/ntcontinuum.h
+++ b/src/pv/ntcontinuum.h
--- a/src/pv/ntenum.h
+++ b/src/pv/ntenum.h
--- a/src/pv/ntfield.h
+++ b/src/pv/ntfield.h
--- a/src/pv/nthistogram.h
+++ b/src/pv/nthistogram.h
--- a/src/pv/ntid.h
+++ b/src/pv/ntid.h
--- a/src/pv/ntmatrix.h
+++ b/src/pv/ntmatrix.h
--- a/src/pv/ntmultiChannel.h
+++ b/src/pv/ntmultiChannel.h
--- a/src/pv/ntnameValue.h
+++ b/src/pv/ntnameValue.h
--- a/src/pv/ntndarray.h
+++ b/src/pv/ntndarray.h
--- a/src/pv/ntndarrayAttribute.h
+++ b/src/pv/ntndarrayAttribute.h
--- a/src/pv/ntscalar.h
+++ b/src/pv/ntscalar.h
--- a/src/pv/ntscalarArray.h
+++ b/src/pv/ntscalarArray.h
--- a/src/pv/ntscalarMultiChannel.h
+++ b/src/pv/ntscalarMultiChannel.h
--- a/src/pv/nttable.h
+++ b/src/pv/nttable.h
--- a/src/pv/ntunion.h
+++ b/src/pv/ntunion.h
--- a/src/pv/nturi.h
+++ b/src/pv/nturi.h
--- a/src/pv/ntutils.h
+++ b/src/pv/ntutils.h
--- a/test/Makefile
+++ b/test/Makefile
@ -1,5 +1,80 @@
-TOP = ..
-include $(TOP)/configure/CONFIG
-DIRS += nt
-include $(TOP)/configure/RULES_DIRS
+TOP=..
+
+include $(TOP)/configure/CONFIG
+
+PROD_LIBS += nt pvData Com
+
+TESTPROD_HOST += ntfieldTest
+ntfieldTest_SRCS += ntfieldTest.cpp
+TESTS += ntfieldTest
+
+TESTPROD_HOST += ntscalarTest
+ntscalarTest_SRCS += ntscalarTest.cpp
+TESTS += ntscalarTest
+
+TESTPROD_HOST += ntscalarArrayTest
+ntscalarArrayTest_SRCS += ntscalarArrayTest.cpp
+TESTS += ntscalarArrayTest
+
+TESTPROD_HOST += ntnameValueTest
+ntnameValueTest_SRCS += ntnameValueTest.cpp
+TESTS += ntnameValueTest
+
+TESTPROD_HOST += ntmultiChannelTest
+ntmultiChannelTest_SRCS += ntmultiChannelTest.cpp
+TESTS += ntmultiChannelTest
+
+TESTPROD_HOST += ntscalarMultiChannelTest
+ntscalarMultiChannelTest_SRCS += ntscalarMultiChannelTest.cpp
+TESTS += ntscalarMultiChannelTest
+
+TESTPROD_HOST += nttableTest
+nttableTest_SRCS = nttableTest.cpp
+TESTS += nttableTest
+
+TESTPROD_HOST += ntndarrayTest
+ntndarrayTest_SRCS = ntndarrayTest.cpp
+TESTS += ntndarrayTest
+
+TESTPROD_HOST += ntmatrixTest
+ntmatrixTest_SRCS = ntmatrixTest.cpp
+TESTS += ntmatrixTest
+
+TESTPROD_HOST += ntenumTest
+ntenumTest_SRCS = ntenumTest.cpp
+TESTS += ntenumTest
+
+TESTPROD_HOST += ntunionTest
+ntunionTest_SRCS = ntunionTest.cpp
+TESTS += ntunionTest
+
+TESTPROD_HOST += ntaggregateTest
+ntaggregateTest_SRCS = ntaggregateTest.cpp
+TESTS += ntaggregateTest
+
+TESTPROD_HOST += ntattributeTest
+ntattributeTest_SRCS = ntattributeTest.cpp
+TESTS += ntattributeTest
+
+TESTPROD_HOST += ntndarrayAttributeTest
+ntndarrayAttributeTest_SRCS = ntndarrayAttributeTest.cpp
+TESTS += ntndarrayAttributeTest
+
+TESTPROD_HOST += ntcontinuumTest
+ntattributeTest_SRCS = ntcontinuumTest.cpp
+TESTS += ntcontinuumTest
+
+TESTPROD_HOST += nthistogramTest
+ntattributeTest_SRCS = nthistogramTest.cpp
+TESTS += nthistogramTest
+
+TESTPROD_HOST += ntutilsTest
+ntutilsTest_SRCS = ntutilsTest.cpp
+TESTS += ntutilsTest
+
+TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE

--- a/test/nt/Makefile
+++ b/test/nt/Makefile
@ -1,80 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_LIBS += nt pvData Com
-
-TESTPROD_HOST += ntfieldTest
-ntfieldTest_SRCS += ntfieldTest.cpp
-TESTS += ntfieldTest
-
-TESTPROD_HOST += ntscalarTest
-ntscalarTest_SRCS += ntscalarTest.cpp
-TESTS += ntscalarTest
-
-TESTPROD_HOST += ntscalarArrayTest
-ntscalarArrayTest_SRCS += ntscalarArrayTest.cpp
-TESTS += ntscalarArrayTest
-
-TESTPROD_HOST += ntnameValueTest
-ntnameValueTest_SRCS += ntnameValueTest.cpp
-TESTS += ntnameValueTest
-
-TESTPROD_HOST += ntmultiChannelTest
-ntmultiChannelTest_SRCS += ntmultiChannelTest.cpp
-TESTS += ntmultiChannelTest
-
-TESTPROD_HOST += ntscalarMultiChannelTest
-ntscalarMultiChannelTest_SRCS += ntscalarMultiChannelTest.cpp
-TESTS += ntscalarMultiChannelTest
-
-TESTPROD_HOST += nttableTest
-nttableTest_SRCS = nttableTest.cpp
-TESTS += nttableTest
-
-TESTPROD_HOST += ntndarrayTest
-ntndarrayTest_SRCS = ntndarrayTest.cpp
-TESTS += ntndarrayTest
-
-TESTPROD_HOST += ntmatrixTest
-ntmatrixTest_SRCS = ntmatrixTest.cpp
-TESTS += ntmatrixTest
-
-TESTPROD_HOST += ntenumTest
-ntenumTest_SRCS = ntenumTest.cpp
-TESTS += ntenumTest
-
-TESTPROD_HOST += ntunionTest
-ntunionTest_SRCS = ntunionTest.cpp
-TESTS += ntunionTest
-
-TESTPROD_HOST += ntaggregateTest
-ntaggregateTest_SRCS = ntaggregateTest.cpp
-TESTS += ntaggregateTest
-
-TESTPROD_HOST += ntattributeTest
-ntattributeTest_SRCS = ntattributeTest.cpp
-TESTS += ntattributeTest
-
-TESTPROD_HOST += ntndarrayAttributeTest
-ntndarrayAttributeTest_SRCS = ntndarrayAttributeTest.cpp
-TESTS += ntndarrayAttributeTest
-
-TESTPROD_HOST += ntcontinuumTest
-ntattributeTest_SRCS = ntcontinuumTest.cpp
-TESTS += ntcontinuumTest
-
-TESTPROD_HOST += nthistogramTest
-ntattributeTest_SRCS = nthistogramTest.cpp
-TESTS += nthistogramTest
-
-TESTPROD_HOST += ntutilsTest
-ntutilsTest_SRCS = ntutilsTest.cpp
-TESTS += ntutilsTest
-
-TESTSCRIPTS_HOST += $(TESTS:%=%.t)
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
--- a/test/nt/ntaggregateTest.cpp
+++ b/test/nt/ntaggregateTest.cpp
--- a/test/nt/ntattributeTest.cpp
+++ b/test/nt/ntattributeTest.cpp
--- a/test/nt/ntcontinuumTest.cpp
+++ b/test/nt/ntcontinuumTest.cpp
--- a/test/nt/ntenumTest.cpp
+++ b/test/nt/ntenumTest.cpp
--- a/test/nt/ntfieldTest.cpp
+++ b/test/nt/ntfieldTest.cpp
--- a/test/nt/nthistogramTest.cpp
+++ b/test/nt/nthistogramTest.cpp
--- a/test/nt/ntmatrixTest.cpp
+++ b/test/nt/ntmatrixTest.cpp
--- a/test/nt/ntmultiChannelTest.cpp
+++ b/test/nt/ntmultiChannelTest.cpp
--- a/test/nt/ntnameValueTest.cpp
+++ b/test/nt/ntnameValueTest.cpp
--- a/test/nt/ntndarrayAttributeTest.cpp
+++ b/test/nt/ntndarrayAttributeTest.cpp
--- a/test/nt/ntndarrayTest.cpp
+++ b/test/nt/ntndarrayTest.cpp
--- a/test/nt/ntscalarArrayTest.cpp
+++ b/test/nt/ntscalarArrayTest.cpp
--- a/test/nt/ntscalarMultiChannelTest.cpp
+++ b/test/nt/ntscalarMultiChannelTest.cpp
--- a/test/nt/ntscalarTest.cpp
+++ b/test/nt/ntscalarTest.cpp
--- a/test/nt/nttableTest.cpp
+++ b/test/nt/nttableTest.cpp
--- a/test/nt/ntunionTest.cpp
+++ b/test/nt/ntunionTest.cpp
--- a/test/nt/ntutilsTest.cpp
+++ b/test/nt/ntutilsTest.cpp