1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 14ec6f7..c251fac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,20 @@
 CC=clang
 CFLAGS=-Wall -g
-BINS = vector.o libvector.a main test
+BINS = vector.o libvector.a vector_test
 all: $(BINS)
 vector.o: vector.h libvector.c
        $(CC) $(CFLAGS) -c libvector.c
 libvector.a: libvector.o
-        ar -cvq libvector.a libvector.o
+        ar -cvq $@ $<
-main: main.c libvector.a
+vector_test: vector_test.c libvector.a
-        $(CC) $(CFLAGS) -o $@ $^
+        $(CC) $(CFLAGS) -o $@ $^ -lcriterion
-test: test.c
+test:
-        gcc test.c -o test -lcriterion
+        ./vector_test
+clean:
+        rm *.o *.a

diff --git a/Makefile b/Makefile index 14ec6f7..c251fac 100644 --- a/Makefile +++ b/Makefile
@@ -1,17 +1,20 @@
1	CC=clang	1	CC=clang
2	CFLAGS=-Wall -g	2	CFLAGS=-Wall -g
3		3
4	BINS = vector.o libvector.a main test	4	BINS = vector.o libvector.a vector_test
5	all: $(BINS)	5	all: $(BINS)
6		6
7	vector.o: vector.h libvector.c	7	vector.o: vector.h libvector.c
8	$(CC) $(CFLAGS) -c libvector.c	8	$(CC) $(CFLAGS) -c libvector.c
9		9
10	libvector.a: libvector.o	10	libvector.a: libvector.o
11	ar -cvq libvector.a libvector.o	11	ar -cvq $@ $<
12		12
13	main: main.c libvector.a	13	vector_test: vector_test.c libvector.a
14	$(CC) $(CFLAGS) -o $@ $^	14	$(CC) $(CFLAGS) -o $@ $^ -lcriterion
15		15
16	test: test.c	16	test:
17	gcc test.c -o test -lcriterion	17	./vector_test
		18
		19	clean:
		20	rm .o .a