github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Update pkg/Makefile and test/pkg/Makefile based on tools/Makefile

Browse Source 
Using explicit targets is cleaner and easier to follow.

Also add `forcepush` to pkg and test/pkg and make `push` explicit.

The `dirs` phony was non-existent in all three cases. Likewise `$(DIR)` wasn't
used in that way in pkg or test/pkg and is nolonger used in that way in tools.

Finally, `clean` was bogus in all cases (tools cleaned a thing which never
exists and pkg and test/pkg were a syntax error).

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-09 14:22:10 +01:00
parent d11e49d113
commit ca70b7b6af
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/Makefile
View File

@ -1,12 +1,15 @@
DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d)
.PHONY: clean dirs $(DIRS) .PHONY: push force-push tag forcetag show-tag clean
# TODO(ijc) once all switch to `linuxkit pkg` update this to: # TODO(ijc) once all switch to `linuxkit pkg` update this to:
# linuxkit pkg <build|push> [--force] $$d # linuxkit pkg <build|push> [--force] $$d
# linuxkit pkg show-tag $$d # linuxkit pkg show-tag $$d
push: push:
@set -e; for d in $(DIRS); do make -C "$$d"; done @set -e; for d in $(DIRS); do make -C "$$d" push; done
forcepush:
@set -e; for d in $(DIRS); do make -C "$$d" forcepush; done
tag: tag:
@set -e; for d in $(DIRS); do make -C "$$d" tag; done @set -e; for d in $(DIRS); do make -C "$$d" tag; done
@ -17,4 +20,4 @@ forcetag:
show-tag: show-tag:
@set -e; for d in $(DIRS); do make -C "$$d" show-tag; done @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done
clean: ; clean:

9
test/pkg/Makefile
View File

@ -1,8 +1,11 @@
DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d)
.PHONY: clean dirs $(DIRS) .PHONY: push forcepush tag forcetag show-tag clean
push: push:
@set -e; for d in $(DIRS); do make -C "$$d"; done @set -e; for d in $(DIRS); do make -C "$$d" push; done
forcepush:
@set -e; for d in $(DIRS); do make -C "$$d" forcepush; done
tag: tag:
@set -e; for d in $(DIRS); do make -C "$$d" tag; done @set -e; for d in $(DIRS); do make -C "$$d" tag; done
@ -13,4 +16,4 @@ forcetag:
show-tag: show-tag:
@set -e; for d in $(DIRS); do make -C "$$d" show-tag; done @set -e; for d in $(DIRS); do make -C "$$d" show-tag; done
clean: ; clean:

19
tools/Makefile
View File

@ -1,10 +1,19 @@
DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d) DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d)
.PHONY: clean dirs $(DIRS) .PHONY: push forcepush tag forcetag show-tag clean
push: $(DIRS) push:
@set -e; for d in $(DIRS); do make -C "$$d" push; done
$(DIRS): forcepush:
$(MAKE) -C $@ @set -e; for d in $(DIRS); do make -C "$$d" forcepush; done
tag:
@set -e; for d in $(DIRS); do make -C "$$d" tag; done
forcetag:
@set -e; for d in $(DIRS); do make -C "$$d" forcetag; done
show-tag:
@set -e; for d in $(DIRS); do make -C "$$d" show-tag; done
clean: clean:
rm -f hash