Move some common input stuff around.

[fjl] / Makefile

diff --git a/Makefile b/Makefile
index 4a1524d29f1951012a0e1cfc0ea62f6e034803f2..a30f39098a04a9bbaaee13a6b376d68351fe0ad5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-std=gnu99 -O2 -msse4.1 -g
+CFLAGS=-std=gnu99 -O2 -msse4.1 -g -Wall -Wextra
 LDFLAGS=
 
 all: tests
@@ -8,11 +8,11 @@ UNSTUFF_TEST_OBJS=unstuff.o unstuff_test.o
 unstuff_test: $(UNSTUFF_TEST_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(UNSTUFF_TEST_OBJS)
 
-INPUT_TEST_OBJS=input.o input_test.o
-input_test: $(INPUT_TEST_OBJS)
-       $(CC) $(LDFLAGS) -o $@ $(INPUT_TEST_OBJS)
+BITSOURCE_TEST_OBJS=bitsource.o bitsource_test.o
+bitsource_test: $(BITSOURCE_TEST_OBJS)
+       $(CC) $(LDFLAGS) -o $@ $(BITSOURCE_TEST_OBJS)
 
-DEHUFF_TEST_OBJS=dehuff.o input.o dehuff_test.o
+DEHUFF_TEST_OBJS=dehuff.o input.o bitsource.o dehuff_test.o
 dehuff_test: $(DEHUFF_TEST_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(DEHUFF_TEST_OBJS)
 
@@ -20,15 +20,15 @@ BYTESOURCE_TEST_OBJS=bytesource.o choice.o unstuff.o bytesource_test.o
 bytesource_test: $(BYTESOURCE_TEST_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(BYTESOURCE_TEST_OBJS)
 
-tests: unstuff_test input_test dehuff_test bytesource_test
+tests: unstuff_test bitsource_test dehuff_test bytesource_test
 clean:
        $(RM) $(UNSTUFF_TEST_OBJS) unstuff_test
-       $(RM) $(INPUT_TEST_OBJS) input_test
+       $(RM) $(BITSOURCE_TEST_OBJS) bitsource_test
        $(RM) $(DEHUFF_TEST_OBJS) dehuff_test
-       $(RM) $(DEHUFF_TEST_OBJS) bytesource_test
+       $(RM) $(BYTESOURCE_TEST_OBJS) bytesource_test
 
 test: tests
        ./unstuff_test
-       ./input_test
+       ./bitsource_test
        ./dehuff_test
        ./bytesource_test