From 6e5c091d8f871383af0332bf80943f69889c0da9 Mon Sep 17 00:00:00 2001
From: Xavier Del Campo Romero <xavi.dcr@tutanota.com>
Date: Fri, 21 Jul 2023 01:22:41 +0200
Subject: Adapt build system to slweb

Now, slweb is a library slcl depends on, which includes the HTTP/1.1
server implementation, as well as other utilities.
---
 CMakeLists.txt |  9 ++-------
 Makefile       | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f0bbaf..56fd5ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,20 +4,15 @@ add_executable(${PROJECT_NAME}
     auth.c
     base64.c
     cftw.c
-    handler.c
     hex.c
-    html.c
-    http.c
     jwt.c
     main.c
     page.c
-    server.c
     style.c
-    wildcard_cmp.c
 )
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
 target_compile_definitions(${PROJECT_NAME} PRIVATE _FILE_OFFSET_BITS=64)
-add_subdirectory(dynstr)
+add_subdirectory(slweb)
 find_package(cJSON 1.0 REQUIRED)
 find_package(OpenSSL 3.0 REQUIRED)
-target_link_libraries(${PROJECT_NAME} PRIVATE dynstr cjson OpenSSL::SSL)
+target_link_libraries(${PROJECT_NAME} PRIVATE slweb dynstr cjson OpenSSL::SSL)
diff --git a/Makefile b/Makefile
index 4636119..78b5ea6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,35 +3,36 @@
 PROJECT = slcl
 O = -Og
 CDEFS = -D_FILE_OFFSET_BITS=64 # Required for large file support on 32-bit.
-CFLAGS = $(O) $(CDEFS) -g -Wall -Idynstr/include -MD -MF $(@:.o=.d)
+CFLAGS = $(O) $(CDEFS) -g -Wall -Islweb/include -Islweb/dynstr/include \
+	-MD -MF $(@:.o=.d)
 LIBS = -lcjson -lssl -lm -lcrypto
 DEPS = $(OBJECTS:.o=.d)
-DYNSTR = dynstr/libdynstr.a
-DYNSTR_FLAGS = -Ldynstr -ldynstr
+DYNSTR = slweb/dynstr/libdynstr.a
+DYNSTR_FLAGS = -Lslweb/dynstr -ldynstr
+SLWEB = slweb/libslweb.a
+SLWEB_FLAGS = -Lslweb -lslweb
 OBJECTS = \
 	auth.o \
 	base64.o \
 	cftw.o \
-	handler.o \
 	hex.o \
-	html.o \
-	http.o \
 	jwt.o \
 	main.o \
 	page.o \
-	server.o \
-	style.o \
-	wildcard_cmp.o \
+	style.o
 
 all: $(PROJECT)
 
 clean:
 	rm -f $(OBJECTS) $(DEPS)
 
-$(PROJECT): $(OBJECTS) $(DYNSTR)
-	$(CC) $(OBJECTS) $(LDFLAGS) $(LIBS) $(DYNSTR_FLAGS) -o $@
+$(PROJECT): $(OBJECTS) $(DYNSTR) $(SLWEB)
+	$(CC) $(OBJECTS) $(LDFLAGS) $(LIBS) $(SLWEB_FLAGS) $(DYNSTR_FLAGS) -o $@
 
 $(DYNSTR):
-	+cd dynstr && $(MAKE)
+	+cd slweb/dynstr && $(MAKE)
+
+$(SLWEB):
+	+cd slweb && $(MAKE)
 
 -include $(DEPS)
-- 
cgit v1.2.3