Makefile: Use dynstr's own Makefile

dynstr has been recently modified so as to allow building also from
make(1).
This commit is contained in:
Xavier Del Campo Romero 2023-05-28 11:41:02 +02:00
parent 20afa79038
commit f3178012f2
Signed by: xavi
GPG Key ID: 84FF3612A9BF43F2
2 changed files with 9 additions and 5 deletions

View File

@ -7,6 +7,8 @@ CFLAGS = $(O) $(CDEFS) -g -Wall -Idynstr/include -MD -MF $(@:.o=.d)
LIBS = -lcjson -lssl -lm -lcrypto
LDFLAGS = $(LIBS)
DEPS = $(OBJECTS:.o=.d)
DYNSTR = dynstr/libdynstr.a
DYNSTR_FLAGS = -Ldynstr -ldynstr
OBJECTS = \
auth.o \
base64.o \
@ -18,15 +20,17 @@ OBJECTS = \
jwt.o \
main.o \
page.o \
server.o \
dynstr/dynstr.o
server.o
all: $(PROJECT)
clean:
rm -f $(OBJECTS) $(DEPS)
$(PROJECT): $(OBJECTS)
$(CC) $(OBJECTS) $(LDFLAGS) -o $@
$(PROJECT): $(OBJECTS) $(DYNSTR)
$(CC) $(OBJECTS) $(LDFLAGS) $(DYNSTR_FLAGS) -o $@
$(DYNSTR):
+cd dynstr && $(MAKE)
-include $(DEPS)

2
dynstr

@ -1 +1 @@
Subproject commit 909d716a1e6d0c03b61b2a73ad3c2bd20fa55cf2
Subproject commit 5c13c9b8385cb2742f342d4d2f64d4e2d21108ba