diff --git a/packaging/Makefile b/packaging/Makefile index f9a35ee..93d8d4a 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -1,4 +1,4 @@ -.PHONY: check-tools build-image build sign clean veryclean keyfile +.PHONY: check-tools build-image build sign clean veryclean keyfile prepare-all clean-all # If you run: # docker run --rm --name squid adricu/alpine-squid @@ -56,7 +56,13 @@ prepare-all: $(patsubst %,%.prepare,$(file < package-list)) @if [ -f packages/$*/Makefile.external ]; then \ $(MAKE) -C packages/$* -f Makefile.external prepare; fi -clean: +clean-all: $(patsubst %,%.clean,$(file < package-list)) + +%.clean: + @if [ -f packages/$*/Makefile.external ]; then \ + $(MAKE) -C packages/$* -f Makefile.external clean; fi + +clean: clean-all rm -f .build-image.* -docker rmi synit-build:aarch64 -docker rmi synit-build:x86_64 diff --git a/packaging/packages/preserves-tools/Makefile.external b/packaging/packages/preserves-tools/Makefile.external index a61b1c1..5b0d9ce 100644 --- a/packaging/packages/preserves-tools/Makefile.external +++ b/packaging/packages/preserves-tools/Makefile.external @@ -1,7 +1,6 @@ # -*- makefile -*- -prepare: preserves - rm -f preserves-tool.$(ARCH) +prepare: preserves miniclean echo nightly > preserves/implementations/rust/rust-toolchain $(MAKE) -C preserves/implementations/rust $(ARCH)-binary-release cp -p preserves/implementations/rust/target/$(ARCH)-*/release/preserves-tool \ @@ -13,3 +12,11 @@ prepare: preserves preserves: git clone https://gitlab.com/preserves/preserves + +miniclean: + rm -f preserves-tool.$(ARCH) + +clean: miniclean + rm -rf preserves/implementations/rust/target + rm -f preserves/implementations/rust/rust-toolchain + rm -f VERSION diff --git a/packaging/packages/syndicate-server/Makefile.external b/packaging/packages/syndicate-server/Makefile.external index da05a9e..43dbd1d 100644 --- a/packaging/packages/syndicate-server/Makefile.external +++ b/packaging/packages/syndicate-server/Makefile.external @@ -1,7 +1,6 @@ # -*- makefile -*- -prepare: syndicate-rs - rm -f syndicate-server.$(ARCH) +prepare: syndicate-rs miniclean $(MAKE) -C syndicate-rs $(ARCH)-binary-release cp -p syndicate-rs/target/$(ARCH)-*/release/syndicate-server syndicate-server.$(ARCH) (cd syndicate-rs/syndicate-server && cargo metadata --format-version 1) \ @@ -12,3 +11,10 @@ prepare: syndicate-rs syndicate-rs: git clone https://git.syndicate-lang.org/syndicate-lang/syndicate-rs + +miniclean: + rm -f syndicate-server.$(ARCH) + +clean: miniclean + rm -rf syndicate-rs/target + rm -f VERSION diff --git a/packaging/packages/synit-config/Makefile.external b/packaging/packages/synit-config/Makefile.external index a42e0fd..a1cb6ec 100644 --- a/packaging/packages/synit-config/Makefile.external +++ b/packaging/packages/synit-config/Makefile.external @@ -2,3 +2,6 @@ prepare: rsync -a ../../../protocols . + +clean: + rm -rf protocols diff --git a/packaging/packages/synit-pid1/Makefile.external b/packaging/packages/synit-pid1/Makefile.external index 38d28db..c49ee95 100644 --- a/packaging/packages/synit-pid1/Makefile.external +++ b/packaging/packages/synit-pid1/Makefile.external @@ -1,9 +1,14 @@ # -*- makefile -*- -prepare: - rm -f synit-pid1.$(ARCH) +prepare: miniclean $(MAKE) -C ../../../synit-pid1 $(ARCH)-binary-release cp -p ../../../synit-pid1/target/$(ARCH)-*/release/synit-pid1 synit-pid1.$(ARCH) (cd ../../../synit-pid1 && cargo metadata --format-version 1) | \ preserves-tool convert --output-format unquoted \ --select '. "packages" / [. "name" = "synit-pid1"] . "version"' > VERSION + +miniclean: + rm -f synit-pid1.$(ARCH) + +clean: miniclean + rm -f VERSION