diff Makefile @ 3:215c0c3b3609

misc: use JSON everywhere (scictl/sciwebd)
author David Demelier <markand@malikania.fr>
date Mon, 14 Jun 2021 22:08:24 +0200
parents 5fa3d2f479b2
children 566bc028cdcb
line wrap: on
line diff
--- a/Makefile	Thu Jun 10 10:39:21 2021 +0200
+++ b/Makefile	Mon Jun 14 22:08:24 2021 +0200
@@ -20,42 +20,44 @@
 
 include config.mk
 
-SCID_SRCS=              base64.c                        \
-                        db.c                            \
-                        job.c                           \
+SCID_SRCS=              db.c                            \
                         util.c                          \
                         scid.c                          \
+                        types.c                         \
                         log.c                           \
                         extern/libsqlite/sqlite3.c
 SCID_DATA=              sql/init.h                      \
-                        sql/job-queue.h                 \
-                        sql/job-result-todo.h           \
-                        sql/job-save.h                  \
+                        sql/job-add.h                   \
+                        sql/job-todo.h                  \
+                        sql/jobresult-add.h             \
+                        sql/project-add.h               \
                         sql/project-find.h              \
-                        sql/project-get.h               \
-                        sql/project-insert.h            \
-                        sql/worker-get.h                \
+                        sql/project-find-id.h           \
+                        sql/project-list.h              \
+                        sql/worker-add.h                \
                         sql/worker-find.h               \
-                        sql/worker-insert.h
+                        sql/worker-find-id.h            \
+                        sql/worker-list.h
 SCID_OBJS=              ${SCID_SRCS:.c=.o}
 SCID_DEPS=              ${SCID_SRCS:.c=.d}
 
-SCIWORKERD_SRCS=        base64.c sciworkerd.c util.c log.c
+SCIWORKERD_SRCS=        sciworkerd.c types.c util.c log.c
 SCIWORKERD_OBJS=        ${SCIWORKERD_SRCS:.c=.o}
 SCIWORKERD_DEPS=        ${SCIWORKERD_SRCS:.c=.d}
 
-SCICTL_SRCS=            base64.c req.c scictl.c util.c
+SCICTL_SRCS=            req.c scictl.c types.c util.c
 SCICTL_OBJS=            ${SCICTL_SRCS:.c=.o}
 SCICTL_DEPS=            ${SCICTL_SRCS:.c=.d}
 
-SCIWEBD_SRCS=           base64.c                        \
-                        http.c                          \
+SCIWEBD_SRCS=           http.c                          \
                         log.c                           \
                         page-api-jobs.c                 \
-                        page-api-script.c               \
+                        page-api-projects.c             \
+                        page-api-workers.c              \
                         page.c                          \
                         req.c                           \
                         sciwebd.c                       \
+                        types.c                         \
                         util.c
 SCIWEBD_OBJS=           ${SCIWEBD_SRCS:.c=.o}
 SCIWEBD_DEPS=           ${SCIWEBD_SRCS:.c=.d}
@@ -77,9 +79,6 @@
 KCGI_INCS=              `pkg-config --cflags kcgi`
 KCGI_LIBS=              `pkg-config --libs kcgi`
 
-ZSTD_INCS=              `pkg-config --cflags libzstd`
-ZSTD_LIBS=              `pkg-config --libs libzstd`
-
 INCS=                   -Iextern/libsqlite
 DEFS=                   -DVARDIR=\"${VARDIR}\" \
                         -DTMPDIR=\"${TMPDIR}\"
@@ -87,10 +86,10 @@
 .SUFFIXES:
 .SUFFIXES: .c .o .sql .h
 
-all: scid scictl sciworkerd sciwebd
+all: scid scictl sciwebd sciworkerd
 
 .c.o:
-	${CC} ${INCS} ${DEFS} ${LIBBSD_INCS} ${KCGI_INCS} ${JANSSON_INCS} ${ZSTD_INCS} ${CFLAGS} -MMD -c $< -o $@
+	${CC} ${INCS} ${DEFS} ${LIBBSD_INCS} ${KCGI_INCS} ${JANSSON_INCS} ${CFLAGS} -MMD -c $< -o $@
 
 .sql.h:
 	./bcc -sc0 $< $< > $@
@@ -108,25 +107,25 @@
 ${SCID_OBJS}: config.h ${SCID_DATA}
 
 scid: ${SCID_OBJS}
-	${CC} ${CFLAGS} -o $@ ${SCID_OBJS} ${LIBBSD_LIBS} ${ZSTD_LIBS} ${LDFLAGS}
+	${CC} ${CFLAGS} -o $@ ${SCID_OBJS} ${LIBBSD_LIBS} ${JANSSON_LIBS} ${LDFLAGS}
 
 ${SCIWORKERD_OBJS}: config.h
 
 sciworkerd: ${SCIWORKERD_OBJS}
-	${CC} ${CFLAGS} -o $@ ${SCIWORKERD_OBJS} ${LIBBSD_LIBS} ${LIBCURL_LIBS} ${JANSSON_LIBS} ${ZSTD_LIBS} ${LDFLAGS}
+	${CC} ${CFLAGS} -o $@ ${SCIWORKERD_OBJS} ${LIBBSD_LIBS} ${LIBCURL_LIBS} ${JANSSON_LIBS} ${LDFLAGS}
 
 ${SCICTL_OBJS}: config.h
 
 scictl: ${SCICTL_OBJS}
-	${CC} ${CFLAGS} -o $@ ${SCICTL_OBJS} ${LIBBSD_LIBS} ${ZSTD_LIBS} ${LDFLAGS}
+	${CC} ${CFLAGS} -o $@ ${SCICTL_OBJS} ${LIBBSD_LIBS} ${JANSSON_LIBS} ${LDFLAGS}
 
 ${SCIWEBD_OBJS}: config.h
 
 sciwebd: ${SCIWEBD_OBJS}
-	${CC} ${CFLAGS} -o $@ ${SCIWEBD_OBJS} ${LIBBSD_LIBS} ${KCGI_LIBS} ${JANSSON_LIBS} ${ZSTD_LIBS} ${LDFLAGS}
+	${CC} ${CFLAGS} -o $@ ${SCIWEBD_OBJS} ${LIBBSD_LIBS} ${KCGI_LIBS} ${JANSSON_LIBS} ${LDFLAGS}
 
 clean:
-	rm -f bcc config.h
+	rm -f bcc config.h tags cscope.out
 	rm -f scid ${SCID_OBJS} ${SCID_DEPS} ${SCID_DATA}
 	rm -f scictl ${SCICTL_OBJS} ${SCICTL_DEPS}
 	rm -f sciworkerd ${SCIWORKERD_OBJS} ${SCIWORKERD_DEPS}