From 28ae865e5ecad9b398ac21fa148fc4b93c987226 Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Tue, 10 Oct 2023 23:43:47 +0200 Subject: Apply slweb renaming to libweb --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7a87332..68e56b6 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,14 @@ DST = $(PREFIX)/bin PROJECT = slcl O = -Og CDEFS = -D_FILE_OFFSET_BITS=64 # Required for large file support on 32-bit. -CFLAGS = $(O) $(CDEFS) -g -Wall -Islweb/include -Islweb/dynstr/include \ +CFLAGS = $(O) $(CDEFS) -g -Wall -Ilibweb/include -Ilibweb/dynstr/include \ -MD -MF $(@:.o=.d) LIBS = -lcjson -lssl -lm -lcrypto DEPS = $(OBJECTS:.o=.d) -DYNSTR = slweb/dynstr/libdynstr.a -DYNSTR_FLAGS = -Lslweb/dynstr -ldynstr -SLWEB = slweb/libslweb.a -SLWEB_FLAGS = -Lslweb -lslweb +DYNSTR = libweb/dynstr/libdynstr.a +DYNSTR_FLAGS = -Llibweb/dynstr -ldynstr +LIBWEB = libweb/libslweb.a +SLWEB_FLAGS = -Llibweb -lweb OBJECTS = \ auth.o \ base64.o \ @@ -34,18 +34,18 @@ install: all usergen clean: rm -f $(OBJECTS) $(DEPS) - +cd slweb && $(MAKE) clean - +cd slweb/dynstr && $(MAKE) clean + +cd libweb && $(MAKE) clean + +cd libweb/dynstr && $(MAKE) clean FORCE: -$(PROJECT): $(OBJECTS) $(DYNSTR) $(SLWEB) +$(PROJECT): $(OBJECTS) $(DYNSTR) $(LIBWEB) $(CC) $(OBJECTS) $(LDFLAGS) $(LIBS) $(SLWEB_FLAGS) $(DYNSTR_FLAGS) -o $@ $(DYNSTR): FORCE - +cd slweb/dynstr && $(MAKE) + +cd libweb/dynstr && $(MAKE) -$(SLWEB): FORCE - +cd slweb && $(MAKE) +$(LIBWEB): FORCE + +cd libweb && $(MAKE) -include $(DEPS) -- cgit v1.2.3