From 68d3051c4f361d751d06075174abd29e8dcfbf04 Mon Sep 17 00:00:00 2001
From: elvis <elvilio98@gmail.com>
Date: Sat, 16 Apr 2022 15:07:25 +0200
Subject: [PATCH] minor fixes

---
 Makefile     | 55 ++++++++++++++++++++++++++++++++++++++--------------
 src/client.c |  3 +++
 src/server.c |  2 --
 3 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 src/client.c

diff --git a/Makefile b/Makefile
index a0334d5..1be3cb6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CFLAGS	       += -std=c99 -Wall -Werror -pedantic -g
 INCDIR          = ./lib/utils ./lib/ini ./lib/threadpool ./src ./lib/log
 INCLUDES       := $(patsubst %,-I %,$(INCDIR))
 LDFLAGS		= -L .
-OPTFLAGS	= #-O3
+OPTFLAGS        = #-O3
 LIBS            = -lpthread
 SOCKET          = ./cs_sock
 
@@ -12,54 +12,79 @@ SRC_DIR         = ./src
 LIB_DIR         = ./lib
 OBJ_DIR         = ./obj
 
-OBJ_SRC        := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(notdir $(wildcard $(SRC_DIR)/*.c))))
+OBJ_SRC_SERVER := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(notdir $(wildcard $(SRC_DIR)/server*.c))))
+OBJ_SRC_CLIENT := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(notdir $(wildcard $(SRC_DIR)/client*.c))))
 OBJ_LIBS       := $(addprefix $(OBJ_DIR)/,$(patsubst %.c,%.o,$(notdir $(wildcard $(LIB_DIR)/*/*.c))))
-OBJ_SERVER     := $(OBJ_SRC) $(OBJ_LIBS)
+
+OBJ_SERVER     := $(OBJ_SRC_SERVER) $(OBJ_LIBS)
+OBJ_CLIENT     := $(OBJ_SRC_CLIENT) $(OBJ_LIBS)
+
 
 VPATH          := $(SRC_DIR) $(wildcard $(LIB_DIR)/*)
 
 .DEFAULT_GOAL  := all
 
-
 .PHONY: all clean cleanall
 
 
-all: $(BUILD_DIR)/server
+all: $(BUILD_DIR)/server $(BUILD_DIR)/client
 	@echo "done!"
 
 
-
+# -SERVER-RULES-----------------------------------------------------------------
 $(OBJ_DIR)/fileQueue.o: fileQueue.c fileQueue.h conn.h fileQueue.h util.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
 
 $(OBJ_DIR)/apiFile.o: apiFile.c apiFile.h fileQueue.h taglialegna.h conn.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
 
 $(OBJ_DIR)/taglialegna.o: taglialegna.c taglialegna.h fileQueue.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
 
 $(OBJ_DIR)/threadpool.o: threadpool.c util.h threadpool.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
 
 $(OBJ_DIR)/ini.o: ini.c ini.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
 
 $(OBJ_DIR)/strsep_gnu.o: strsep_gnu.c strsep_gnu.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
 
 $(OBJ_DIR)/serverWorker.o: serverWorker.c serverWorker.h apiFile.h fileQueue.h taglialegna.h threadpool.h conn.h message.h strsep_gnu.h
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
 
 $(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 $@
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
 
 $(BUILD_DIR)/server: $(OBJ_SERVER)
-	$(CC) $(CFLAGS) $(LIBS) $(OBJ_SERVER) -o $(BUILD_DIR)/server
+	@$(CC) $(CFLAGS) $(LIBS) $(OBJ_SERVER) -o $(BUILD_DIR)/server
+	@echo $@
 
 
+# -CLIENT-RULES-----------------------------------------------------------------
+$(OBJ_DIR)/client.o: client.c
+	@$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	@echo $@
+
+$(BUILD_DIR)/client: $(OBJ_CLIENT)
+	@$(CC) $(CFLAGS) $(LIBS) $(OBJ_CLIENT) -o $(BUILD_DIR)/client
+	@echo $@
+
+
+# -PHONY------------------------------------------------------------------------
 clean :
 	@rm -rf $(BUILD_DIR)/* logs/*.log
 
 cleanall : clean
 	@rm -rf $(OBJ_DIR)/*
 	@rm -f $(SOCKET)
+
+# print-%  : ; @echo $* = $($*)
diff --git a/src/client.c b/src/client.c
new file mode 100644
index 0000000..33c14ce
--- /dev/null
+++ b/src/client.c
@@ -0,0 +1,3 @@
+int main() {
+    return 0;
+}
diff --git a/src/server.c b/src/server.c
index 8e08b39..bfe2c91 100644
--- a/src/server.c
+++ b/src/server.c
@@ -30,8 +30,6 @@ typedef struct {
     int         signal_pipe;  // descrittore di scrittura di una pipe senza nome
 } sigHandler_t;
 
-
-
 // funzione eseguita dal signal handler thread
 static void *sigHandler(void *arg);