refactor: generalized Makefile by adding CC and CFLAGS variables. Changed from realtive to absolute paths for includes

15 files changed, 46 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index e5a9c54..2455ece 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,34 @@
+CC=gcc
+CFLAGS=-iquote ./analyzer
+
 global: compile
 	sudo mv branal /usr/bin
 
 local: compile
 	mv branal ${HOME}/.local/bin
 
-compile: utils capture analyzer parser
-	gcc *.o main.c -lpcap -o branal
+compile: structures utils capture analyzer parser
+	$(CC) $(CFLAGS) -lpcap *.o main.c -o branal
 	rm *.o
 
-utils: structures
-	gcc -c analyzer/utils/fs.c
-	gcc -c analyzer/utils/time.c
-	gcc -c analyzer/utils/tcp.c
-	gcc -c analyzer/utils/tcp_seq_math.c
-
 structures:
-	gcc -c analyzer/utils/structures/hashmap.c
-	gcc -c analyzer/utils/structures/heap.c
+	$(CC) $(CFLAGS) -c analyzer/structures/hashmap.c
+	$(CC) $(CFLAGS) -c analyzer/structures/heap.c
+
+utils:
+	$(CC) $(CFLAGS) -c analyzer/utils/fs.c
+	$(CC) $(CFLAGS) -c analyzer/utils/time.c
+	$(CC) $(CFLAGS) -c analyzer/utils/tcp.c
+	$(CC) $(CFLAGS) -c analyzer/utils/tcp_seq_math.c
 
 capture:
-	gcc -c analyzer/capture.c
+	$(CC) $(CFLAGS) -c analyzer/capture.c
 
 analyzer:
-	gcc -c analyzer/analyzer.c
+	$(CC) $(CFLAGS) -c analyzer/analyzer.c
 
 parser:
-	gcc -c analyzer/parser/parser.c
-	gcc -c analyzer/parser/fight_results.c
+	$(CC) $(CFLAGS) -c analyzer/parser/parser.c
+	$(CC) $(CFLAGS) -c analyzer/parser/fight_results.c
 
 .PHONY: analyzer
diff --git a/analyzer/parser/fight_results.c b/analyzer/parser/fight_results.c
index 4fbb0f8..65e72ea 100644
--- a/analyzer/parser/fight_results.c
+++ b/analyzer/parser/fight_results.c
@@ -1,4 +1,4 @@
-#include "fight_results.h"
+#include "parser/fight_results.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/analyzer/parser/fight_results.h b/analyzer/parser/fight_results.h
index 4e1ea60..de7f525 100644
--- a/analyzer/parser/fight_results.h
+++ b/analyzer/parser/fight_results.h
@@ -1,8 +1,8 @@
 // parser/fight_results.h
 // utilities for parsing the fight results data
 
-#include "../utils/tcp.h"
-#include "parser_defs.h"
+#include "parser/parser_defs.h"
+#include "utils/tcp.h"
 
 // Payload structure:
 // FIGHT_RESULTS_START EntityResults (SEPARATOR_ENTITY EntityResults)* FIGHT_RESULTS_END
diff --git a/analyzer/parser/find_parse_functions.h b/analyzer/parser/find_parse_functions.h
index 4e53274..dd7579e 100644
--- a/analyzer/parser/find_parse_functions.h
+++ b/analyzer/parser/find_parse_functions.h
@@ -1,7 +1,7 @@
 // parser/find_parse_functions.h
 // array of find and parse functions for every result type
 
-#include "fight_results.h"
+#include "parser/fight_results.h"
 
 #define RESULT_TYPE_COUNT 1
 
diff --git a/analyzer/parser/parser.c b/analyzer/parser/parser.c
index 246635c..3ef48b5 100644
--- a/analyzer/parser/parser.c
+++ b/analyzer/parser/parser.c
@@ -1,8 +1,8 @@
-#include "parser.h"
+#include "parser/parser.h"
 
 #include <stdlib.h>
 
-#include "find_parse_functions.h"
+#include "parser/find_parse_functions.h"
 
 // expand parsed data exponentially to fit el_count elements
 ParsedData *expand_parsed_data(ParsedData *parsed_data, size_t *capacity, size_t el_count) {
diff --git a/analyzer/parser/parser.h b/analyzer/parser/parser.h
index e2d5c5d..4b28aa7 100644
--- a/analyzer/parser/parser.h
+++ b/analyzer/parser/parser.h
@@ -1,9 +1,9 @@
 // parser/parser.h
 // main parser file
 
-#include "../utils/tcp.h"
-#include "fight_results.h"
-#include "parser_defs.h"
+#include "parser/fight_results.h"
+#include "parser/parser_defs.h"
+#include "utils/tcp.h"
 
 #define INIT_PARSED_DATA_CAPACITY 4
 
diff --git a/analyzer/parser/parser_defs.h b/analyzer/parser/parser_defs.h
index b76b7e6..6af6059 100644
--- a/analyzer/parser/parser_defs.h
+++ b/analyzer/parser/parser_defs.h
@@ -1,7 +1,7 @@
 // parser/parser_defs.h
 // useful definitions for parser files
 
-#include "../utils/tcp.h"
+#include "utils/tcp.h"
 
 #ifndef TYPE_ENUM_DEFINED
 #define TYPE_ENUM_DEFINED
diff --git a/analyzer/utils/structures/hashmap.c b/analyzer/structures/hashmap.c
index 5c7fdf9..ed2eb4b 100644
--- a/analyzer/utils/structures/hashmap.c
+++ b/analyzer/structures/hashmap.c
@@ -1,10 +1,14 @@
-#include "hashmap.h"
+#include "structures/hashmap.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 HashMap *hashmap_new(
-    size_t key_size, size_t value_size, size_t (*hash)(void *key), int (*compare)(void *key1, void *key2), void (*key_cleanup)(void *key),
+    size_t key_size,
+    size_t value_size,
+    size_t (*hash)(void *key),
+    int (*compare)(void *key1, void *key2),
+    void (*key_cleanup)(void *key),
     void (*value_cleanup)(void *key)
 ) {
     HashMap *map = malloc(sizeof(HashMap));
diff --git a/analyzer/utils/structures/hashmap.h b/analyzer/structures/hashmap.h
index 4f8e24a..528f24a 100644
--- a/analyzer/utils/structures/hashmap.h
+++ b/analyzer/structures/hashmap.h
@@ -1,4 +1,4 @@
-// utils/structures/hashmap.h
+// structures/hashmap.h
 // a simple implementation of hashmap using linked list
 
 #include <stddef.h>
@@ -47,7 +47,11 @@ typedef struct {
 // returns:
 //      pointer to the new hash map
 extern HashMap *hashmap_new(
-    size_t key_size, size_t value_size, size_t (*hash)(void *key), int (*compare)(void *key1, void *key2), void (*key_cleanup)(void *key),
+    size_t key_size,
+    size_t value_size,
+    size_t (*hash)(void *key),
+    int (*compare)(void *key1, void *key2),
+    void (*key_cleanup)(void *key),
     void (*value_cleanup)(void *value)
 );
 
diff --git a/analyzer/utils/structures/heap.c b/analyzer/structures/heap.c
index 5310299..690aac1 100644
--- a/analyzer/utils/structures/heap.c
+++ b/analyzer/structures/heap.c
@@ -1,4 +1,4 @@
-#include "heap.h"
+#include "structures/heap.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/analyzer/utils/structures/heap.h b/analyzer/structures/heap.h
index eb3430b..8a23164 100644
--- a/analyzer/utils/structures/heap.h
+++ b/analyzer/structures/heap.h
@@ -1,4 +1,4 @@
-// utils/structures/heap.h
+// structures/heap.h
 // a simple implementation of heap
 
 #include <stddef.h>
diff --git a/analyzer/utils/fs.c b/analyzer/utils/fs.c
index 2dd8191..5e3eb1c 100644
--- a/analyzer/utils/fs.c
+++ b/analyzer/utils/fs.c
@@ -1,4 +1,4 @@
-#include "fs.h"
+#include "utils/fs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/analyzer/utils/tcp.c b/analyzer/utils/tcp.c
index 56df842..ab5303e 100644
--- a/analyzer/utils/tcp.c
+++ b/analyzer/utils/tcp.c
@@ -1,4 +1,4 @@
-#include "tcp.h"
+#include "utils/tcp.h"
 
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tcp_seq_math.h"
+#include "utils/tcp_seq_math.h"
 
 // initalize default TCP segment
 TCPSegment new_segment() {
diff --git a/analyzer/utils/tcp_seq_math.c b/analyzer/utils/tcp_seq_math.c
index 272cb5a..2cc6e3f 100644
--- a/analyzer/utils/tcp_seq_math.c
+++ b/analyzer/utils/tcp_seq_math.c
@@ -1,4 +1,4 @@
-#include "tcp_seq_math.h"
+#include "utils/tcp_seq_math.h"
 
 int seq_after(uint32_t a, uint32_t b) {
     return (int32_t)(a - b) > 0;
diff --git a/analyzer/utils/time.c b/analyzer/utils/time.c
index 72c0bc7..d95da65 100644
--- a/analyzer/utils/time.c
+++ b/analyzer/utils/time.c
@@ -1,4 +1,4 @@
-#include "time.h"
+#include "utils/time.h"
 
 #include <stdio.h>
 #include <time.h>