Skip to content

Commit 614b8e9

Browse files
committed
Fix incremental build with directory makeful
1 parent 7c94d8d commit 614b8e9

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

directory/Makefile

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ MAIN_PACKAGE=cmd/directory
77
COVERAGE=coverage.out
88
SQLC ?= $(GO) tool sqlc
99
OAPI_CODEGEN ?= $(GO) tool oapi-codegen
10+
SQL_GEN_IN := sqlc.yaml query.sql $(wildcard migrations/*.sql) go.mod go.sum
11+
SQL_GEN_OUT := db/db.go db/models.go db/query.sql.go
12+
OAPI_GEN_IN := api.yaml oapi-codegen.yaml go.mod go.sum
13+
OAPI_GEN_OUT := api/directory.gen.go
1014

1115
.PHONY: all docker generate generate-sqlc generate-api check checkinclgen run fmt fmt-check lint vulncheck clean deps-update tools-update
1216

@@ -15,15 +19,19 @@ all: $(BINARY)
1519
docker:
1620
cd .. && $(DOCKER) build -f ./directory/Dockerfile .
1721

18-
generate: generate-sqlc generate-api
22+
generate: $(SQL_GEN_OUT) $(OAPI_GEN_OUT)
1923

20-
generate-sqlc:
24+
generate-sqlc: $(SQL_GEN_OUT)
25+
26+
$(SQL_GEN_OUT) &: $(SQL_GEN_IN)
2127
$(SQLC) generate
2228

23-
generate-api:
29+
generate-api: $(OAPI_GEN_OUT)
30+
31+
$(OAPI_GEN_OUT): $(OAPI_GEN_IN)
2432
$(OAPI_CODEGEN) --config=oapi-codegen.yaml api.yaml
2533

26-
$(BINARY): generate $(GOFILES)
34+
$(BINARY): $(SQL_GEN_OUT) $(OAPI_GEN_OUT) $(GOFILES)
2735
$(GO) build -v -o $(BINARY) ./$(MAIN_PACKAGE)
2836

2937
checkinclgen: generate
@@ -60,5 +68,5 @@ tools-update:
6068

6169
clean:
6270
rm -f $(BINARY) $(COVERAGE) $(COVERAGE).tmp \
63-
api/directory.gen.go \
64-
db/db.go db/models.go db/query.sql.go
71+
$(OAPI_GEN_OUT) \
72+
$(SQL_GEN_OUT)

0 commit comments

Comments
 (0)