From 6f7fc692b0121efbd826544dc837f006449a8083 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 8 Sep 2022 19:17:41 -0400 Subject: [PATCH] Move *.c and *.h into server/ directory. --- webcit-ng/.gitignore | 1 + webcit-ng/Makefile | 17 +++-------------- webcit-ng/{ => server}/admin_functions.c | 0 webcit-ng/{ => server}/caldav_reports.c | 0 webcit-ng/{ => server}/ctdl_commands.c | 0 webcit-ng/{ => server}/ctdlclient.c | 0 webcit-ng/{ => server}/ctdlfunctions.c | 0 webcit-ng/{ => server}/floor_functions.c | 0 webcit-ng/{ => server}/forum_view.c | 0 webcit-ng/{ => server}/html2html.c | 0 webcit-ng/{ => server}/http.c | 0 webcit-ng/{ => server}/main.c | 0 webcit-ng/{ => server}/messages.c | 0 webcit-ng/{ => server}/request.c | 0 webcit-ng/{ => server}/room_functions.c | 0 webcit-ng/{ => server}/static.c | 0 webcit-ng/{ => server}/tcp_sockets.c | 0 webcit-ng/{ => server}/text2html.c | 0 webcit-ng/{ => server}/tls.c | 0 webcit-ng/{ => server}/user_functions.c | 0 webcit-ng/{ => server}/util.c | 0 webcit-ng/{ => server}/webcit.h | 0 webcit-ng/{ => server}/webserver.c | 0 23 files changed, 4 insertions(+), 14 deletions(-) rename webcit-ng/{ => server}/admin_functions.c (100%) rename webcit-ng/{ => server}/caldav_reports.c (100%) rename webcit-ng/{ => server}/ctdl_commands.c (100%) rename webcit-ng/{ => server}/ctdlclient.c (100%) rename webcit-ng/{ => server}/ctdlfunctions.c (100%) rename webcit-ng/{ => server}/floor_functions.c (100%) rename webcit-ng/{ => server}/forum_view.c (100%) rename webcit-ng/{ => server}/html2html.c (100%) rename webcit-ng/{ => server}/http.c (100%) rename webcit-ng/{ => server}/main.c (100%) rename webcit-ng/{ => server}/messages.c (100%) rename webcit-ng/{ => server}/request.c (100%) rename webcit-ng/{ => server}/room_functions.c (100%) rename webcit-ng/{ => server}/static.c (100%) rename webcit-ng/{ => server}/tcp_sockets.c (100%) rename webcit-ng/{ => server}/text2html.c (100%) rename webcit-ng/{ => server}/tls.c (100%) rename webcit-ng/{ => server}/user_functions.c (100%) rename webcit-ng/{ => server}/util.c (100%) rename webcit-ng/{ => server}/webcit.h (100%) rename webcit-ng/{ => server}/webserver.c (100%) diff --git a/webcit-ng/.gitignore b/webcit-ng/.gitignore index 425df94f3..19f1cbfce 100644 --- a/webcit-ng/.gitignore +++ b/webcit-ng/.gitignore @@ -1,3 +1,4 @@ *.d *.o +*~ webcit diff --git a/webcit-ng/Makefile b/webcit-ng/Makefile index 0fc1ded6d..cda937007 100644 --- a/webcit-ng/Makefile +++ b/webcit-ng/Makefile @@ -1,24 +1,13 @@ -OBJS := http.o main.o request.o tls.o static.o tcp_sockets.o webserver.o ctdlclient.o \ - admin_functions.o room_functions.o util.o caldav_reports.o messages.o \ - ctdlfunctions.o ctdl_commands.o forum_view.o html2html.o text2html.o user_functions.o \ - floor_functions.o CFLAGS := -ggdb -Wno-format-truncation LDFLAGS := # link -webcit: $(OBJS) - gcc $(OBJS) $(LDFLAGS) -lcitadel -lpthread -lcrypto -lssl -lexpat -o webcit - -# pull in dependency info for *existing* .o files --include $(OBJS:.o=.d) - -# compile and generate dependency info -%.o: %.c - gcc -c $(CFLAGS) $*.c -o $*.o +webcit: server/*.c + gcc server/*.c $(LDFLAGS) -lcitadel -lpthread -lcrypto -lssl -lexpat -o webcit # remove compilation products clean: - rm -f webcit *.o *.d + rm -f webcit distclean: clean diff --git a/webcit-ng/admin_functions.c b/webcit-ng/server/admin_functions.c similarity index 100% rename from webcit-ng/admin_functions.c rename to webcit-ng/server/admin_functions.c diff --git a/webcit-ng/caldav_reports.c b/webcit-ng/server/caldav_reports.c similarity index 100% rename from webcit-ng/caldav_reports.c rename to webcit-ng/server/caldav_reports.c diff --git a/webcit-ng/ctdl_commands.c b/webcit-ng/server/ctdl_commands.c similarity index 100% rename from webcit-ng/ctdl_commands.c rename to webcit-ng/server/ctdl_commands.c diff --git a/webcit-ng/ctdlclient.c b/webcit-ng/server/ctdlclient.c similarity index 100% rename from webcit-ng/ctdlclient.c rename to webcit-ng/server/ctdlclient.c diff --git a/webcit-ng/ctdlfunctions.c b/webcit-ng/server/ctdlfunctions.c similarity index 100% rename from webcit-ng/ctdlfunctions.c rename to webcit-ng/server/ctdlfunctions.c diff --git a/webcit-ng/floor_functions.c b/webcit-ng/server/floor_functions.c similarity index 100% rename from webcit-ng/floor_functions.c rename to webcit-ng/server/floor_functions.c diff --git a/webcit-ng/forum_view.c b/webcit-ng/server/forum_view.c similarity index 100% rename from webcit-ng/forum_view.c rename to webcit-ng/server/forum_view.c diff --git a/webcit-ng/html2html.c b/webcit-ng/server/html2html.c similarity index 100% rename from webcit-ng/html2html.c rename to webcit-ng/server/html2html.c diff --git a/webcit-ng/http.c b/webcit-ng/server/http.c similarity index 100% rename from webcit-ng/http.c rename to webcit-ng/server/http.c diff --git a/webcit-ng/main.c b/webcit-ng/server/main.c similarity index 100% rename from webcit-ng/main.c rename to webcit-ng/server/main.c diff --git a/webcit-ng/messages.c b/webcit-ng/server/messages.c similarity index 100% rename from webcit-ng/messages.c rename to webcit-ng/server/messages.c diff --git a/webcit-ng/request.c b/webcit-ng/server/request.c similarity index 100% rename from webcit-ng/request.c rename to webcit-ng/server/request.c diff --git a/webcit-ng/room_functions.c b/webcit-ng/server/room_functions.c similarity index 100% rename from webcit-ng/room_functions.c rename to webcit-ng/server/room_functions.c diff --git a/webcit-ng/static.c b/webcit-ng/server/static.c similarity index 100% rename from webcit-ng/static.c rename to webcit-ng/server/static.c diff --git a/webcit-ng/tcp_sockets.c b/webcit-ng/server/tcp_sockets.c similarity index 100% rename from webcit-ng/tcp_sockets.c rename to webcit-ng/server/tcp_sockets.c diff --git a/webcit-ng/text2html.c b/webcit-ng/server/text2html.c similarity index 100% rename from webcit-ng/text2html.c rename to webcit-ng/server/text2html.c diff --git a/webcit-ng/tls.c b/webcit-ng/server/tls.c similarity index 100% rename from webcit-ng/tls.c rename to webcit-ng/server/tls.c diff --git a/webcit-ng/user_functions.c b/webcit-ng/server/user_functions.c similarity index 100% rename from webcit-ng/user_functions.c rename to webcit-ng/server/user_functions.c diff --git a/webcit-ng/util.c b/webcit-ng/server/util.c similarity index 100% rename from webcit-ng/util.c rename to webcit-ng/server/util.c diff --git a/webcit-ng/webcit.h b/webcit-ng/server/webcit.h similarity index 100% rename from webcit-ng/webcit.h rename to webcit-ng/server/webcit.h diff --git a/webcit-ng/webserver.c b/webcit-ng/server/webserver.c similarity index 100% rename from webcit-ng/webserver.c rename to webcit-ng/server/webserver.c -- 2.39.2