From ed4a8f9068a2a880280954db7f9424bbdc1dee5a Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 17 Feb 2025 02:03:37 +0800 Subject: [PATCH] *: Restructure build system --- Makefile | 6 +++++- git_hooks_client/Makefile | 3 --- resources.go | 4 ++-- diff --git a/Makefile b/Makefile index 723218243f66dd3a624160c1e02e4e754040cdc5..a35195cbe47f408fac849ed4bfcef697f10eb954 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,12 @@ .PHONY: clean version.go -forge: $(filter-out forge,$(wildcard *)) version.go +CFLAGS = -Wall -Wextra -Werror -pedantic -std=c99 -D_GNU_SOURCE + +forge: $(filter-out forge,$(wildcard *)) version.go git_hooks_client/*.c git_hooks_client/git_hooks_client go mod vendor go build -o $@ + +git_hooks_client/git_hooks_client: version.go: printf 'package main\nconst VERSION="%s"\n' $(shell git describe --tags --long --always --dirty) > $@ diff --git a/git_hooks_client/Makefile b/git_hooks_client/Makefile deleted file mode 100644 index f8f2c50e4016cce2bd45bbd5cb10f71c017c0807..0000000000000000000000000000000000000000 --- a/git_hooks_client/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CFLAGS = -Wall -Wextra -Werror -pedantic -std=c99 -D_GNU_SOURCE - -git_hooks_client: diff --git a/resources.go b/resources.go index 7d24cb30eb6ae3e9da50410c70da15c35cbb7fc0..4367f8e858ca0706faa8d4acfe6a3c1309a5e951 100644 --- a/resources.go +++ b/resources.go @@ -14,7 +14,7 @@ //go:embed *.scfg //go:embed Makefile //go:embed schema.sql //go:embed static/* templates/* -//go:embed git_hooks_client/* +//go:embed git_hooks_client/*.c //go:embed vendor/* var source_fs embed.FS @@ -27,7 +27,7 @@ http.FileServer(http.FS(source_fs)), ) } -//go:embed templates/* static/* +//go:embed templates/* static/* git_hooks_client/git_hooks_client var resources_fs embed.FS var templates *template.Template -- 2.48.1