From 1045fa6eedcc2c5abc3a506470ad34b19794fe52 Mon Sep 17 00:00:00 2001
From: elvis <elvilio98@gmail.com>
Date: Sat, 9 Apr 2022 00:37:56 +0200
Subject: [PATCH] update makefile with all headers as dependencies

---
 Makefile                   | 30 ++++++++++++++----------------
 lib/log/taglialegna.c      |  5 +++--
 lib/log/taglialegna.h      |  3 +++
 lib/threadpool/apiFile.c   |  3 +++
 lib/threadpool/apiFile.h   |  8 +++++---
 lib/threadpool/fileQueue.c |  3 +++
 lib/threadpool/fileQueue.h |  2 +-
 src/serverWorker.c         |  2 ++
 src/serverWorker.h         |  2 ++
 9 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 3a43ea3..16a4f00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 CC		= gcc
-AR              = ar
 CFLAGS	       += -std=c99 -Wall -Werror -pedantic -g
-ARFLAGS         = rvs
 INCDIR          = ./lib/utils ./lib/ini ./lib/threadpool ./src ./lib/log
 INCLUDES       := $(patsubst %,-I %,$(INCDIR))
 LDFLAGS		= -L .
@@ -31,26 +29,26 @@ all: $(BUILD_DIR)/server
 
 
 
-$(OBJ_DIR)/fileQueue.o: fileQueue.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $^ -o $@
+$(OBJ_DIR)/fileQueue.o: fileQueue.c fileQueue.h conn.h fileQueue.h util.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/apiFile.o: apiFile.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $^ -o $@
+$(OBJ_DIR)/apiFile.o: apiFile.c apiFile.h fileQueue.h taglialegna.h conn.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/taglialegna.o: taglialegna.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $^ -o $@
+$(OBJ_DIR)/taglialegna.o: taglialegna.c taglialegna.h fileQueue.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/threadpool.o: threadpool.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $^ -o $@
+$(OBJ_DIR)/threadpool.o: threadpool.c util.h threadpool.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/ini.o: ini.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $^ -o $@
+$(OBJ_DIR)/ini.o: ini.c ini.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/serverWorker.o: serverWorker.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $^ -o $@
+$(OBJ_DIR)/serverWorker.o: serverWorker.c serverWorker.h apiFile.h fileQueue.h taglialegna.h threadpool.h conn.h message.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/server.o: server.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $^ -o $@
+$(OBJ_DIR)/server.o: server.c threadpool.h conn.h util.h serverWorker.h ini.h serverUtil.h fileQueue.h taglialegna.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(BUILD_DIR)/server: $(OBJ_SERVER)
 	$(CC) $(CFLAGS) $(LIBS) $(OBJ_SERVER) -o $(BUILD_DIR)/server
diff --git a/lib/log/taglialegna.c b/lib/log/taglialegna.c
index b9ae058..876aae1 100644
--- a/lib/log/taglialegna.c
+++ b/lib/log/taglialegna.c
@@ -1,9 +1,10 @@
-#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include <taglialegna.h>
 #include <fileQueue.h>
diff --git a/lib/log/taglialegna.h b/lib/log/taglialegna.h
index 48ed1d3..ecd6fc6 100644
--- a/lib/log/taglialegna.h
+++ b/lib/log/taglialegna.h
@@ -2,6 +2,9 @@
 #ifndef _TAGLIALEGNA
 #define _TAGLIALEGNA
 
+#include <stdio.h>
+#include <pthread.h>
+
 #include <fileQueue.h>
 
 typedef struct taglia_s {
diff --git a/lib/threadpool/apiFile.c b/lib/threadpool/apiFile.c
index cb50500..fff79d7 100644
--- a/lib/threadpool/apiFile.c
+++ b/lib/threadpool/apiFile.c
@@ -1,6 +1,9 @@
 #include <strings.h>
+#include <errno.h>
 
+#include <conn.h>
 #include <apiFile.h>
+#include <fileQueue.h>
 #include <taglialegna.h>
 
 #define MAXLENMESS 512
diff --git a/lib/threadpool/apiFile.h b/lib/threadpool/apiFile.h
index 437b9e8..2dc915b 100644
--- a/lib/threadpool/apiFile.h
+++ b/lib/threadpool/apiFile.h
@@ -2,15 +2,17 @@
 #ifndef _API_FILE
 #define _API_FILE
 
+#include <pthread.h>
+
 #include <fileQueue.h>
 #include <taglialegna.h>
 /* TODO: finire tutte le descrizioni */
 
 // Lista dei client in attesa su una lock
 typedef struct struct_waiting {
-    long fd;                       // client in attesa
-    char *file;                    // file su cui si vuole acquisire la lock
-    struct struct_waiting *next;   // puntatore al prossimo elemento della lista
+    long fd;                     // client in attesa
+    char *file;                  // file su cui si vuole acquisire la lock
+    struct struct_waiting *next; // puntatore al prossimo elemento della lista
 } waiting_t;
 
 /**
diff --git a/lib/threadpool/fileQueue.c b/lib/threadpool/fileQueue.c
index 17f454f..a87f7ee 100644
--- a/lib/threadpool/fileQueue.c
+++ b/lib/threadpool/fileQueue.c
@@ -1,3 +1,6 @@
+#include <stdlib.h>
+#include <stdio.h>
+
 #include <fileQueue.h>
 #include <util.h>
 
diff --git a/lib/threadpool/fileQueue.h b/lib/threadpool/fileQueue.h
index f335867..ae45b0a 100644
--- a/lib/threadpool/fileQueue.h
+++ b/lib/threadpool/fileQueue.h
@@ -3,8 +3,8 @@
 #define _FILE_QUEUE
 
 #include <stdio.h>
-
 #include <pthread.h>
+
 #include <conn.h>
 
 // struttura dati per gestire i file in memoria principale
diff --git a/src/serverWorker.c b/src/serverWorker.c
index 7ce9766..3008ba5 100644
--- a/src/serverWorker.c
+++ b/src/serverWorker.c
@@ -1,9 +1,11 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <assert.h>
 #include <sys/select.h>
+#include <pthread.h>
 
 #include <conn.h>
 #include <message.h>
diff --git a/src/serverWorker.h b/src/serverWorker.h
index 0f925b9..857aa8f 100644
--- a/src/serverWorker.h
+++ b/src/serverWorker.h
@@ -2,6 +2,8 @@
 #ifndef SERVERWORKER
 #define SERVERWORKER
 
+#include <pthread.h>
+
 #include <apiFile.h>
 #include <fileQueue.h>
 #include <taglialegna.h>