tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

buildsys: try to avoid duplicate build due to "phony" docs dependency

Browse Source 
Make docs target depend directly on the some docs-only required
binaries and add a new intermediate ".do-cargo-build" target that is
explicitly not a PHONY target.

That avoids one extra set of full builds.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2021-07-12 13:15:17 +02:00
parent 415690a0e7
commit 424d2d68d3
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -73,7 +73,7 @@ DESTDIR=
tests ?= --workspace tests ?= --workspace
all: cargo-build $(SUBDIRS) all: $(SUBDIRS)
.PHONY: $(SUBDIRS) .PHONY: $(SUBDIRS)
$(SUBDIRS): $(SUBDIRS):
@ -134,6 +134,7 @@ clean: clean-deb
$(foreach i,$(SUBDIRS), \ $(foreach i,$(SUBDIRS), \
$(MAKE) -C $(i) clean ;) $(MAKE) -C $(i) clean ;)
$(CARGO) clean $(CARGO) clean
rm -f .do-cargo-build
find . -name '*~' -exec rm {} ';' find . -name '*~' -exec rm {} ';'
# allows one to avoid running cargo clean when one just wants to tidy up after a packgae build # allows one to avoid running cargo clean when one just wants to tidy up after a packgae build
@ -145,10 +146,15 @@ dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB}
dpkg -i $^ dpkg -i $^
# make sure we build binaries before docs # make sure we build binaries before docs
docs: cargo-build docs: $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen
.PHONY: cargo-build .PHONY: cargo-build
cargo-build: cargo-build:
rm -f .do-cargo-build
$(MAKE) $(COMPILED_BINS)
$(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
.do-cargo-build:
RUSTFLAGS="--cfg openid" $(CARGO) build $(CARGO_BUILD_ARGS) \ RUSTFLAGS="--cfg openid" $(CARGO) build $(CARGO_BUILD_ARGS) \
--bin proxmox-backup-api --bin proxmox-backup-proxy \ --bin proxmox-backup-api --bin proxmox-backup-proxy \
--bin proxmox-backup-manager --bin docgen --bin proxmox-backup-manager --bin docgen
@ -163,8 +169,8 @@ cargo-build:
--bin proxmox-tape \ --bin proxmox-tape \
--bin pxar \ --bin pxar \
--bin sg-tape-cmd --bin sg-tape-cmd
touch "$@"
$(COMPILED_BINS): cargo-build
.PHONY: lint .PHONY: lint
lint: lint: