minor fixes

This commit is contained in:
elvis
2022-04-16 15:07:25 +02:00
parent a7a0027f86
commit 68d3051c4f
3 changed files with 43 additions and 17 deletions

View File

@ -3,7 +3,7 @@ CFLAGS += -std=c99 -Wall -Werror -pedantic -g
INCDIR = ./lib/utils ./lib/ini ./lib/threadpool ./src ./lib/log INCDIR = ./lib/utils ./lib/ini ./lib/threadpool ./src ./lib/log
INCLUDES := $(patsubst %,-I %,$(INCDIR)) INCLUDES := $(patsubst %,-I %,$(INCDIR))
LDFLAGS = -L . LDFLAGS = -L .
OPTFLAGS = #-O3 OPTFLAGS = #-O3
LIBS = -lpthread LIBS = -lpthread
SOCKET = ./cs_sock SOCKET = ./cs_sock
@ -12,54 +12,79 @@ SRC_DIR = ./src
LIB_DIR = ./lib LIB_DIR = ./lib
OBJ_DIR = ./obj 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_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)/*) VPATH := $(SRC_DIR) $(wildcard $(LIB_DIR)/*)
.DEFAULT_GOAL := all .DEFAULT_GOAL := all
.PHONY: all clean cleanall .PHONY: all clean cleanall
all: $(BUILD_DIR)/server all: $(BUILD_DIR)/server $(BUILD_DIR)/client
@echo "done!" @echo "done!"
# -SERVER-RULES-----------------------------------------------------------------
$(OBJ_DIR)/fileQueue.o: fileQueue.c fileQueue.h conn.h fileQueue.h util.h $(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 $(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 $(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 $(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 $(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 $(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 $(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 $(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) $(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 : clean :
@rm -rf $(BUILD_DIR)/* logs/*.log @rm -rf $(BUILD_DIR)/* logs/*.log
cleanall : clean cleanall : clean
@rm -rf $(OBJ_DIR)/* @rm -rf $(OBJ_DIR)/*
@rm -f $(SOCKET) @rm -f $(SOCKET)
# print-% : ; @echo $* = $($*)

3
src/client.c Normal file
View File

@ -0,0 +1,3 @@
int main() {
return 0;
}

View File

@ -30,8 +30,6 @@ typedef struct {
int signal_pipe; // descrittore di scrittura di una pipe senza nome int signal_pipe; // descrittore di scrittura di una pipe senza nome
} sigHandler_t; } sigHandler_t;
// funzione eseguita dal signal handler thread // funzione eseguita dal signal handler thread
static void *sigHandler(void *arg); static void *sigHandler(void *arg);