fold basic and indefinite length tests in with the others; fix up Makefile
diff --git a/Makefile b/Makefile
index 233164b..c739908 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
 
 QCBOR_OBJ=src/UsefulBuf.o src/qcbor_encode.o src/qcbor_decode.o src/ieee754.o
 
-TEST_OBJ=test/basic_test.o test/bstrwrap_tests.o test/run_tests.o test/half_precision_test.o \
-  test/half_to_double_from_rfc7049.o
+TEST_OBJ=test/UsefulBuf_Tests.o test/qcbor_encode_tests.o test/qcbor_decode_tests.o test/run_tests.o \
+  test/float_tests.o test/half_to_double_from_rfc7049.o
 
 CMD_LINE_OBJ=$(QCBOR_OBJ) $(TEST_OBJ) cmd_line_main.o
 
@@ -15,10 +15,12 @@
 src/qcbor_encode.o:	inc/UsefulBuf.h inc/qcbor.h src/ieee754.h
 src/iee754.o:	src/ieee754.h 
 
-test/basic_test.o:	test/basic_test.h inc/qcbor.h inc/UsefulBuf.h
-test/bstrwrap_tests.o:	test/bstrwrap_tests.h inc/qcbor.h inc/UsefulBuf.h
-test/run_tests.o:	test/half_precision_test.h test/run_tests.h test/basic_test.h test/bstrwrap_tests.h
-test/half_precision_test.o:	inc/qcbor.h test/half_precision_test.h test/half_to_double_from_rfc7049.h
+test/run_tests.o:	test/UsefulBuf_Tests.h test/float_tests.h test/run_tests.h test/qcbor_encode_tests.h\
+    test/qcbor_decode_tests.h
+test/UsefulBuf_Tests.o:	test/UsefulBuf_Tests.h inc/qcbor.h inc/UsefulBuf.h
+test/qcbor_encode_tests.o:	test/qcbor_encode_tests.h inc/qcbor.h inc/UsefulBuf.h
+test/qcbor_decode_tests.o:	test/qcbor_decode_tests.h inc/qcbor.h inc/UsefulBuf.h
+test/float_tests.o:	inc/qcbor.h inc/UsefulBuf.h test/float_tests.h test/half_to_double_from_rfc7049.h
 test/half_to_double_from_rfc7049.o:	test/half_to_double_from_rfc7049.h
 
 cmd_line_main.o:	test/run_tests.h