Merge branch 'rework-directory-structure'

26 files changed, 9 insertions, 79 deletions

diff --git a/.gitignore b/.gitignore
index 08b10b0..5c96b5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,2 @@
 .tags
-allocator
-arraylist
-avl
-deque
-dlist
-hashtab
-heap
-list
-list-tail-node
-queue
-quicksort
-rb
-ringbuff
-stack
-stack2
-tags
-tree
-insertsort
-shellsort
+bin/*
diff --git a/compile_flags.txt b/compile_flags.txt
deleted file mode 100644
index d36fd95..0000000
--- a/compile_flags.txt
+++ /dev/null
@@ -1,8 +0,0 @@
--Wall
--Werror
--Wextra
--Wno-unused-function
--Wsign-conversion
--pedantic
--std=c11
--I/usr/local/include
diff --git a/makefile b/makefile
index 14f5db3..4b6f5b8 100644
--- a/makefile
+++ b/makefile
@@ -1,64 +1,19 @@
 .PHONY: all clean
 
+BINS=bin/list bin/list-tail-node bin/dlist bin/stack bin/stack2 bin/queue bin/ringbuff bin/hashtab bin/tree bin/avl bin/heap bin/quicksort bin/allocator bin/rb bin/deque bin/arraylist bin/insertsort bin/shellsort
+
 CFLAGS=-Wall -Werror -Wextra -Wno-unused-function -Wsign-conversion -pedantic -std=c99 -g
-BINS=list list-tail-node dlist stack stack2 queue ringbuff hashtab tree avl heap quicksort allocator rb deque arraylist insertsort shellsort
 
 all: $(BINS)
 
-list: list.c util.h
-        cc $(CFLAGS) $< -o $@
+bin:
+        mkdir -p $@
 
-list-tail-node: list-tail-node.c util.h
-        cc $(CFLAGS) $< -o $@
-
-dlist: dlist.c util.h
-        cc $(CFLAGS) $< -o $@
-
-stack: stack.c util.h
-        cc $(CFLAGS) $< -o $@
-
-stack2: stack2.c util.h
-        cc $(CFLAGS) $< -o $@
-
-queue: queue.c util.h
-        cc $(CFLAGS) $< -o $@
-
-ringbuff: ringbuff.c util.h
-        cc $(CFLAGS) $< -o $@
-
-hashtab: hashtab.c util.h
-        cc $(CFLAGS) $< -o $@
-
-tree: tree.c util.h
-        cc $(CFLAGS) $< -o $@
-
-avl: avl.c util.h
-        cc $(CFLAGS) $< -o $@
-
-rb: rb.c util.h
-        cc $(CFLAGS) $< -o $@
-
-deque: deque.c util.h
-        cc $(CFLAGS) $< -o $@
-
-heap: heap.c util.h
-        cc $(CFLAGS) $< -o $@
-
-quicksort: quicksort.c util.h
-        cc $(CFLAGS) $< -o $@
-
-allocator: allocator.c allocator.h
-        cc $(CFLAGS) $< -o $@
-
-arraylist: arraylist.c util.h
-        cc $(CFLAGS) $< -o $@
-
-insertsort: insertsort.c util.h
-        cc $(CFLAGS) $< -o $@
+bin/allocator: src/allocator.h
 
-shellsort: shellsort.c util.h
+bin/%: src/%.c src/util.h | bin
         cc $(CFLAGS) $< -o $@
 
 clean:
-        rm -f $(BINS)
+        rm -rf bin
 
diff --git a/allocator.c b/src/allocator.c
index 98fa69f..98fa69f 100644
--- a/allocator.c
+++ b/src/allocator.c
diff --git a/allocator.h b/src/allocator.h
index dd9bb16..dd9bb16 100644
--- a/allocator.h
+++ b/src/allocator.h
diff --git a/arraylist.c b/src/arraylist.c
index f010d07..f010d07 100644
--- a/arraylist.c
+++ b/src/arraylist.c
diff --git a/avl.c b/src/avl.c
index 5bb4415..874cc6c 100644
--- a/avl.c
+++ b/src/avl.c
@@ -1,4 +1,5 @@
 // AVL Tree
+#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/deque.c b/src/deque.c
index 881d1d3..881d1d3 100644
--- a/deque.c
+++ b/src/deque.c
diff --git a/dlist.c b/src/dlist.c
index 55e42d7..55e42d7 100644
--- a/dlist.c
+++ b/src/dlist.c
diff --git a/hashtab.c b/src/hashtab.c
index 256fac9..256fac9 100644
--- a/hashtab.c
+++ b/src/hashtab.c
diff --git a/heap.c b/src/heap.c
index 091e761..091e761 100644
--- a/heap.c
+++ b/src/heap.c
diff --git a/insertsort.c b/src/insertsort.c
index 1a30a1a..1a30a1a 100644
--- a/insertsort.c
+++ b/src/insertsort.c
diff --git a/list-tail-node.c b/src/list-tail-node.c
index edfcf31..edfcf31 100644
--- a/list-tail-node.c
+++ b/src/list-tail-node.c
diff --git a/list.c b/src/list.c
index d18dae4..d18dae4 100644
--- a/list.c
+++ b/src/list.c
diff --git a/queue.c b/src/queue.c
index 6a472ee..6a472ee 100644
--- a/queue.c
+++ b/src/queue.c
diff --git a/quicksort.c b/src/quicksort.c
index 4657dcd..4657dcd 100644
--- a/quicksort.c
+++ b/src/quicksort.c
diff --git a/random.h b/src/random.h
index 9094d5b..9094d5b 100644
--- a/random.h
+++ b/src/random.h
diff --git a/rb.c b/src/rb.c
index 7c2d2c1..7c2d2c1 100644
--- a/rb.c
+++ b/src/rb.c
diff --git a/rc4.c b/src/rc4.c
index 8a67303..8a67303 100644
--- a/rc4.c
+++ b/src/rc4.c
diff --git a/ringbuff.c b/src/ringbuff.c
index 1294b3b..1294b3b 100644
--- a/ringbuff.c
+++ b/src/ringbuff.c
diff --git a/shellsort.c b/src/shellsort.c
index 29e6bf8..29e6bf8 100644
--- a/shellsort.c
+++ b/src/shellsort.c
diff --git a/stack.c b/src/stack.c
index 48b9eba..48b9eba 100644
--- a/stack.c
+++ b/src/stack.c
diff --git a/stack2.c b/src/stack2.c
index 5f4ba41..5f4ba41 100644
--- a/stack2.c
+++ b/src/stack2.c
diff --git a/tree.c b/src/tree.c
index 93690e2..93690e2 100644
--- a/tree.c
+++ b/src/tree.c
diff --git a/treeutil.h b/src/treeutil.h
index 76627c0..76627c0 100644
--- a/treeutil.h
+++ b/src/treeutil.h
diff --git a/util.h b/src/util.h
index 7ede6fd..7ede6fd 100644
--- a/util.h
+++ b/src/util.h