mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Makefile: remove superfluous @
This commit is contained in:
parent
05a71be79d
commit
7a3dded74d
@ -86,7 +86,7 @@ endef
|
|||||||
.PHONY: all
|
.PHONY: all
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
all:
|
all:
|
||||||
@echo "$$ALL_HELP_INFO"
|
echo "$$ALL_HELP_INFO"
|
||||||
else
|
else
|
||||||
all: generated_files
|
all: generated_files
|
||||||
hack/make-rules/build.sh $(WHAT)
|
hack/make-rules/build.sh $(WHAT)
|
||||||
@ -101,7 +101,7 @@ endef
|
|||||||
.PHONY: ginkgo
|
.PHONY: ginkgo
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
ginkgo:
|
ginkgo:
|
||||||
@echo "$$GINKGO_HELP_INFO"
|
echo "$$GINKGO_HELP_INFO"
|
||||||
else
|
else
|
||||||
ginkgo:
|
ginkgo:
|
||||||
hack/make-rules/build.sh vendor/github.com/onsi/ginkgo/ginkgo
|
hack/make-rules/build.sh vendor/github.com/onsi/ginkgo/ginkgo
|
||||||
@ -122,7 +122,7 @@ endef
|
|||||||
.PHONY: verify
|
.PHONY: verify
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
verify:
|
verify:
|
||||||
@echo "$$VERIFY_HELP_INFO"
|
echo "$$VERIFY_HELP_INFO"
|
||||||
else
|
else
|
||||||
verify:
|
verify:
|
||||||
KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh
|
KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh
|
||||||
@ -137,7 +137,7 @@ endef
|
|||||||
.PHONY: quick-verify
|
.PHONY: quick-verify
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
quick-verify:
|
quick-verify:
|
||||||
@echo "$$QUICK_VERIFY_HELP_INFO"
|
echo "$$QUICK_VERIFY_HELP_INFO"
|
||||||
else
|
else
|
||||||
quick-verify:
|
quick-verify:
|
||||||
QUICK=true SILENT=false hack/make-rules/verify.sh
|
QUICK=true SILENT=false hack/make-rules/verify.sh
|
||||||
@ -152,7 +152,7 @@ endef
|
|||||||
.PHONY: update
|
.PHONY: update
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
update:
|
update:
|
||||||
@echo "$$UPDATE_HELP_INFO"
|
echo "$$UPDATE_HELP_INFO"
|
||||||
else
|
else
|
||||||
update: generated_files
|
update: generated_files
|
||||||
CALLED_FROM_MAIN_MAKEFILE=1 hack/make-rules/update.sh
|
CALLED_FROM_MAIN_MAKEFILE=1 hack/make-rules/update.sh
|
||||||
@ -178,7 +178,7 @@ endef
|
|||||||
.PHONY: check test
|
.PHONY: check test
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
check test:
|
check test:
|
||||||
@echo "$$CHECK_TEST_HELP_INFO"
|
echo "$$CHECK_TEST_HELP_INFO"
|
||||||
else
|
else
|
||||||
check test: generated_files
|
check test: generated_files
|
||||||
hack/make-rules/test.sh $(WHAT) $(TESTS)
|
hack/make-rules/test.sh $(WHAT) $(TESTS)
|
||||||
@ -197,7 +197,7 @@ endef
|
|||||||
.PHONY: test-integration
|
.PHONY: test-integration
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
test-integration:
|
test-integration:
|
||||||
@echo "$$TEST_IT_HELP_INFO"
|
echo "$$TEST_IT_HELP_INFO"
|
||||||
else
|
else
|
||||||
test-integration: generated_files
|
test-integration: generated_files
|
||||||
hack/make-rules/test-integration.sh $(WHAT)
|
hack/make-rules/test-integration.sh $(WHAT)
|
||||||
@ -268,7 +268,7 @@ endef
|
|||||||
.PHONY: test-e2e-node
|
.PHONY: test-e2e-node
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
test-e2e-node:
|
test-e2e-node:
|
||||||
@echo "$$TEST_E2E_NODE_HELP_INFO"
|
echo "$$TEST_E2E_NODE_HELP_INFO"
|
||||||
else
|
else
|
||||||
test-e2e-node: ginkgo generated_files
|
test-e2e-node: ginkgo generated_files
|
||||||
hack/make-rules/test-e2e-node.sh
|
hack/make-rules/test-e2e-node.sh
|
||||||
@ -287,7 +287,7 @@ endef
|
|||||||
.PHONY: test-cmd
|
.PHONY: test-cmd
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
test-cmd:
|
test-cmd:
|
||||||
@echo "$$TEST_CMD_HELP_INFO"
|
echo "$$TEST_CMD_HELP_INFO"
|
||||||
else
|
else
|
||||||
test-cmd: generated_files
|
test-cmd: generated_files
|
||||||
hack/make-rules/test-cmd.sh
|
hack/make-rules/test-cmd.sh
|
||||||
@ -304,7 +304,7 @@ endef
|
|||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
clean:
|
clean:
|
||||||
@echo "$$CLEAN_HELP_INFO"
|
echo "$$CLEAN_HELP_INFO"
|
||||||
else
|
else
|
||||||
clean: clean_meta
|
clean: clean_meta
|
||||||
build/make-clean.sh
|
build/make-clean.sh
|
||||||
@ -320,7 +320,7 @@ endef
|
|||||||
.PHONY: clean_meta
|
.PHONY: clean_meta
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
clean_meta:
|
clean_meta:
|
||||||
@echo "$$CLEAN_META_HELP_INFO"
|
echo "$$CLEAN_META_HELP_INFO"
|
||||||
else
|
else
|
||||||
clean_meta:
|
clean_meta:
|
||||||
rm -rf $(META_DIR)
|
rm -rf $(META_DIR)
|
||||||
@ -336,7 +336,7 @@ endef
|
|||||||
.PHONY: clean_generated
|
.PHONY: clean_generated
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
clean_generated:
|
clean_generated:
|
||||||
@echo "$$CLEAN_GENERATED_HELP_INFO"
|
echo "$$CLEAN_GENERATED_HELP_INFO"
|
||||||
else
|
else
|
||||||
clean_generated:
|
clean_generated:
|
||||||
find . -type f -name '$(GENERATED_FILE_PREFIX)*' | xargs rm -f
|
find . -type f -name '$(GENERATED_FILE_PREFIX)*' | xargs rm -f
|
||||||
@ -357,7 +357,7 @@ endef
|
|||||||
.PHONY: vet
|
.PHONY: vet
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
vet:
|
vet:
|
||||||
@echo "$$VET_HELP_INFO"
|
echo "$$VET_HELP_INFO"
|
||||||
else
|
else
|
||||||
vet: generated_files
|
vet: generated_files
|
||||||
CALLED_FROM_MAIN_MAKEFILE=1 hack/make-rules/vet.sh $(WHAT)
|
CALLED_FROM_MAIN_MAKEFILE=1 hack/make-rules/vet.sh $(WHAT)
|
||||||
@ -376,7 +376,7 @@ endef
|
|||||||
.PHONY: release release-in-a-container
|
.PHONY: release release-in-a-container
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
release release-in-a-container:
|
release release-in-a-container:
|
||||||
@echo "$$RELEASE_HELP_INFO"
|
echo "$$RELEASE_HELP_INFO"
|
||||||
else
|
else
|
||||||
release release-in-a-container: KUBE_BUILD_CONFORMANCE = y
|
release release-in-a-container: KUBE_BUILD_CONFORMANCE = y
|
||||||
release:
|
release:
|
||||||
@ -398,7 +398,7 @@ endef
|
|||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
release-images: KUBE_BUILD_CONFORMANCE = y
|
release-images: KUBE_BUILD_CONFORMANCE = y
|
||||||
release-images:
|
release-images:
|
||||||
@echo "$$RELEASE_IMAGES_HELP_INFO"
|
echo "$$RELEASE_IMAGES_HELP_INFO"
|
||||||
else
|
else
|
||||||
release-images:
|
release-images:
|
||||||
build/release-images.sh
|
build/release-images.sh
|
||||||
@ -420,7 +420,7 @@ endef
|
|||||||
.PHONY: release-skip-tests quick-release
|
.PHONY: release-skip-tests quick-release
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
release-skip-tests quick-release:
|
release-skip-tests quick-release:
|
||||||
@echo "$$RELEASE_SKIP_TESTS_HELP_INFO"
|
echo "$$RELEASE_SKIP_TESTS_HELP_INFO"
|
||||||
else
|
else
|
||||||
release-skip-tests quick-release: KUBE_RELEASE_RUN_TESTS = n
|
release-skip-tests quick-release: KUBE_RELEASE_RUN_TESTS = n
|
||||||
release-skip-tests quick-release: KUBE_FASTBUILD = true
|
release-skip-tests quick-release: KUBE_FASTBUILD = true
|
||||||
@ -441,7 +441,7 @@ endef
|
|||||||
.PHONY: quick-release-images
|
.PHONY: quick-release-images
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
quick-release-images:
|
quick-release-images:
|
||||||
@echo "$$QUICK_RELEASE_IMAGES_HELP_INFO"
|
echo "$$QUICK_RELEASE_IMAGES_HELP_INFO"
|
||||||
else
|
else
|
||||||
quick-release-images: KUBE_FASTBUILD = true
|
quick-release-images: KUBE_FASTBUILD = true
|
||||||
quick-release-images:
|
quick-release-images:
|
||||||
@ -459,7 +459,7 @@ endef
|
|||||||
.PHONY: package package-tarballs
|
.PHONY: package package-tarballs
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
package package-tarballs:
|
package package-tarballs:
|
||||||
@echo "$$PACKAGE_HELP_INFO"
|
echo "$$PACKAGE_HELP_INFO"
|
||||||
else
|
else
|
||||||
package-tarballs: KUBE_BUILD_CONFORMANCE = y
|
package-tarballs: KUBE_BUILD_CONFORMANCE = y
|
||||||
package package-tarballs:
|
package package-tarballs:
|
||||||
@ -479,7 +479,7 @@ endef
|
|||||||
.PHONY: cross cross-in-a-container
|
.PHONY: cross cross-in-a-container
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
cross cross-in-a-container:
|
cross cross-in-a-container:
|
||||||
@echo "$$CROSS_HELP_INFO"
|
echo "$$CROSS_HELP_INFO"
|
||||||
else
|
else
|
||||||
cross cross-in-a-container: KUBE_BUILD_CONFORMANCE = y
|
cross cross-in-a-container: KUBE_BUILD_CONFORMANCE = y
|
||||||
cross:
|
cross:
|
||||||
@ -487,7 +487,7 @@ cross:
|
|||||||
cross-in-a-container: KUBE_OUTPUT_SUBPATH = $(OUT_DIR)/dockerized
|
cross-in-a-container: KUBE_OUTPUT_SUBPATH = $(OUT_DIR)/dockerized
|
||||||
cross-in-a-container:
|
cross-in-a-container:
|
||||||
ifeq (,$(wildcard /.dockerenv))
|
ifeq (,$(wildcard /.dockerenv))
|
||||||
@echo -e "\nThe 'cross-in-a-container' target can only be used from within a docker container.\n"
|
echo -e "\nThe 'cross-in-a-container' target can only be used from within a docker container.\n"
|
||||||
else
|
else
|
||||||
hack/make-rules/cross.sh
|
hack/make-rules/cross.sh
|
||||||
endif
|
endif
|
||||||
@ -505,7 +505,7 @@ CMD_TARGET = $(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*
|
|||||||
.PHONY: $(CMD_TARGET)
|
.PHONY: $(CMD_TARGET)
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
$(CMD_TARGET):
|
$(CMD_TARGET):
|
||||||
@echo "$$CMD_HELP_INFO"
|
echo "$$CMD_HELP_INFO"
|
||||||
else
|
else
|
||||||
$(CMD_TARGET): generated_files
|
$(CMD_TARGET): generated_files
|
||||||
hack/make-rules/build.sh cmd/$@
|
hack/make-rules/build.sh cmd/$@
|
||||||
@ -520,7 +520,7 @@ endef
|
|||||||
.PHONY: generated_files
|
.PHONY: generated_files
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
generated_files:
|
generated_files:
|
||||||
@echo "$$GENERATED_FILES_HELP_INFO"
|
echo "$$GENERATED_FILES_HELP_INFO"
|
||||||
else
|
else
|
||||||
generated_files gen_openapi:
|
generated_files gen_openapi:
|
||||||
$(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1
|
$(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1
|
||||||
@ -535,7 +535,7 @@ endef
|
|||||||
.PHONY: help
|
.PHONY: help
|
||||||
ifeq ($(PRINT_HELP),y)
|
ifeq ($(PRINT_HELP),y)
|
||||||
help:
|
help:
|
||||||
@echo "$$HELP_INFO"
|
echo "$$HELP_INFO"
|
||||||
else
|
else
|
||||||
help:
|
help:
|
||||||
hack/make-rules/make-help.sh
|
hack/make-rules/make-help.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user