diff options
| author | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2023-05-28 11:41:02 +0200 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2023-05-28 12:07:38 +0200 |
| commit | f3178012f26be1b69c4b2cdc3fdda79e6092d9f8 (patch) | |
| tree | 81ebaa0b1e57ec2bf0d0b19dc41f583c41b83f30 | |
| parent | 20afa79038ec04e8a222d384410efec74ac40931 (diff) | |
| download | slcl-f3178012f26be1b69c4b2cdc3fdda79e6092d9f8.tar.gz | |
Makefile: Use dynstr's own Makefile
dynstr has been recently modified so as to allow building also from
make(1).
| -rw-r--r-- | Makefile | 12 | ||||
| m--------- | dynstr | 0 |
2 files changed, 8 insertions, 4 deletions
@@ -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) diff --git a/dynstr b/dynstr -Subproject 909d716a1e6d0c03b61b2a73ad3c2bd20fa55cf +Subproject 5c13c9b8385cb2742f342d4d2f64d4e2d21108b |