Merge branch 'release/1.3'

[reservoir_sample] / Makefile

diff --git a/Makefile b/Makefile
index 8f8f4b7daf8ae73eb0f7055a7145336894334491..e1b5ff8dd0b14a3eb5ebaec2ec83c70614aae599 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 #!make
 
-ifeq "$(origin CC)" "default"
-CC = clang
-endif
+#ifeq "$(origin CC)" "default"
+#CC = clang
+#endif
 
 CFLAGS += -g -Wall -Wextra
 CFLAGS += -O3
@@ -13,8 +13,8 @@ MAKEDEPEND = $(CC) -MM
 
 TARGETS = reservoir_sample
 TEST_DIR = test
-TESTS = $(addprefix $(TEST_DIR)/, reservoir_sample_test)
-SOURCES = reservoir_sample.c notify.c
+TESTS = $(addprefix $(TEST_DIR)/, buf_test reservoir_test)
+SOURCES = reservoir_sample.c notify.c buf.c randomness.c reservoir.c
 OBJECTS = $(SOURCES:.c=.o)
 TEST_OBJECTS = $(TESTS:=.o) test_suite.o
 
@@ -39,12 +39,15 @@ check:      test
                echo Checking $${t};\
                ./$${t} > /dev/null || echo -- $${t} FAILED --;\
        done
+       $(TEST_DIR)/validate-statistics.sh
 
 $(TEST_DIR)/%_test.o:  %.c
        $(CC) $(CFLAGS) $(CPPFLAGS) -DTEST -c -o $@ $<
 
-$(TEST_DIR)/reservoir_sample_test:     %: %.o test_suite.o notify.o
+$(TEST_DIR)/buf_test:  %: %.o test_suite.o notify.o
 
-reservoir_sample:      %: %.o notify.o
+$(TEST_DIR)/reservoir_test:    %: %.o test_suite.o notify.o buf.o randomness.o
+
+reservoir_sample:      %: %.o notify.o buf.o randomness.o reservoir.o
 
 -include .depend