From 4f3f6784d4c3a7bf77edd5b48f5470fdef3f60dd Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 1 Feb 2016 16:25:09 -0500 Subject: [PATCH] adjust Makefiles --- configure/CONFIG_SITE | 3 -- src/Makefile | 44 +++++++++++------------ test/Makefile | 83 ++++++++++++++++++++++++++++++++++++++++--- test/nt/Makefile | 80 ----------------------------------------- 4 files changed, 99 insertions(+), 111 deletions(-) delete mode 100644 test/nt/Makefile diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 430c427..db4ce4f 100644 --- 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 diff --git a/src/Makefile b/src/Makefile index 9539da2..3b2ebce 100644 --- 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 diff --git a/test/Makefile b/test/Makefile index df3e48a..c4b7dbe 100644 --- 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 diff --git a/test/nt/Makefile b/test/nt/Makefile deleted file mode 100644 index 06a955c..0000000 --- a/test/nt/Makefile +++ /dev/null @@ -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 -