aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorOnur Gündüz <ogunduz@gmail.com>2026-06-25 22:26:00 +0200
committerOnur Gündüz <ogunduz@gmail.com>2026-06-25 22:26:00 +0200
commitfe3fe5d737e61e6e179b63f0480216c421810fd8 (patch)
tree3ba8b7ce178187b31261d8a1cd2ae2e97a1e9d05 /tools
parent6a9aa3302362e7d129b804cd621d39a1c1e7c43d (diff)
downloadffwd-fe3fe5d737e61e6e179b63f0480216c421810fd8.tar.gz
ffwd-fe3fe5d737e61e6e179b63f0480216c421810fd8.zip
build: vendor yyjson 0.12.0 in deps/yyjson
Diffstat (limited to 'tools')
-rw-r--r--tools/cli/Makefile8
-rw-r--r--tools/server/Makefile8
2 files changed, 12 insertions, 4 deletions
diff --git a/tools/cli/Makefile b/tools/cli/Makefile
index 47f697a..895b6fa 100644
--- a/tools/cli/Makefile
+++ b/tools/cli/Makefile
@@ -5,11 +5,12 @@ include $(ROOT)/build.mk
.DEFAULT_GOAL := all
LIBFFWD := $(ROOT)/libffwd
+YYJSON := $(ROOT)/deps/yyjson
BIN := $(OUTDIR)/ffwd-cli
SRCS := main.c
-LIBS := $(OUTDIR)/libffwd.a
-LDLIBS := $(BACKEND_LDFLAGS) $(YYJSON_LDFLAGS) -lm
+LIBS := $(OUTDIR)/libffwd.a $(OUTDIR)/libyyjson.a
+LDLIBS := $(BACKEND_LDFLAGS) -lm
CFLAGS += -std=gnu11 -pthread
CPPFLAGS += -I. -I$(LIBFFWD)
@@ -19,4 +20,7 @@ $(OBJDIR)/main.o: CFLAGS += $(VERSION_CFLAGS)
$(OUTDIR)/libffwd.a:
$(MAKE) -C $(LIBFFWD)
+$(OUTDIR)/libyyjson.a:
+ $(MAKE) -C $(YYJSON)
+
$(eval $(program))
diff --git a/tools/server/Makefile b/tools/server/Makefile
index 34c8608..a2cd5a2 100644
--- a/tools/server/Makefile
+++ b/tools/server/Makefile
@@ -4,6 +4,7 @@ include $(ROOT)/build.mk
LIBFFWD := $(ROOT)/libffwd
AE := $(ROOT)/deps/ae
+YYJSON := $(ROOT)/deps/yyjson
BIN := $(OUTDIR)/ffwd-server
SRCS := base64.c encode.c handlers.c http.c json.c main.c models.c sbuf.c \
@@ -14,8 +15,8 @@ DEPS := $(call deps,$(OBJS))
TEST_BINS := test_base64 test_sbuf test_encode test_json test_schedule test_models
TEST_OBJS := $(filter-out $(OBJDIR)/main.o,$(OBJS))
-LIBS := $(OUTDIR)/libffwd.a $(OUTDIR)/libae.a
-LDLIBS := $(YYJSON_LDFLAGS) $(BACKEND_LDFLAGS) -lm
+LIBS := $(OUTDIR)/libffwd.a $(OUTDIR)/libae.a $(OUTDIR)/libyyjson.a
+LDLIBS := $(BACKEND_LDFLAGS) -lm
CFLAGS += -std=gnu11 -pthread
CPPFLAGS += -I. -I$(LIBFFWD) -I$(AE)
@@ -41,6 +42,9 @@ $(OUTDIR)/libffwd.a:
$(OUTDIR)/libae.a:
$(MAKE) -C $(AE)
+$(OUTDIR)/libyyjson.a:
+ $(MAKE) -C $(YYJSON)
+
clean:
$(RM) -r $(OBJDIR) $(BIN) $(BIN).dSYM \
$(TEST_BINS) $(addsuffix .dSYM,$(TEST_BINS))