diff --git a/build/root/Makefile b/build/root/Makefile index c7e16e90e6b..32ddf4fda04 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -124,7 +124,7 @@ ifeq ($(PRINT_HELP),y) verify: @echo "$$VERIFY_HELP_INFO" else -verify: verify_generated_files +verify: KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh endif @@ -139,7 +139,7 @@ ifeq ($(PRINT_HELP),y) quick-verify: @echo "$$QUICK_VERIFY_HELP_INFO" else -quick-verify: verify_generated_files +quick-verify: QUICK=true SILENT=false hack/make-rules/verify.sh endif @@ -483,21 +483,6 @@ generated_files: $(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1 endif -define VERIFY_GENERATED_FILES_HELP_INFO -# Verify auto-generated files needed for the build. -# -# Example: -# make verify_generated_files -endef -.PHONY: verify_generated_files -ifeq ($(PRINT_HELP),y) -verify_generated_files: - @echo "$$VERIFY_GENERATED_FILES_HELP_INFO" -else -verify_generated_files: - $(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1 -endif - define HELP_INFO # Print make targets and help info # diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files index 59372a0c305..d373c470d5b 100644 --- a/build/root/Makefile.generated_files +++ b/build/root/Makefile.generated_files @@ -37,11 +37,6 @@ SHELL := /bin/bash .PHONY: generated_files generated_files: gen_deepcopy gen_defaulter gen_conversion gen_openapi gen_bindata -.PHONY: verify_generated_files -verify_generated_files: verify_gen_deepcopy \ - verify_gen_defaulter \ - verify_gen_conversion - # Code-generation logic. # # This stuff can be pretty tricky, and there's probably some corner cases that @@ -245,10 +240,6 @@ RUN_GEN_DEEPCOPY = \ gen_deepcopy: $(DEEPCOPY_FILES) $(DEEPCOPY_GEN) $(RUN_GEN_DEEPCOPY) -.PHONY: verify_gen_deepcopy -verify_gen_deepcopy: $(DEEPCOPY_GEN) - $(RUN_GEN_DEEPCOPY) --verify-only - # For each dir in DEEPCOPY_DIRS, this establishes a dependency between the # output file and the input files that should trigger a rebuild. # @@ -383,10 +374,6 @@ RUN_GEN_DEFAULTER := \ gen_defaulter: $(DEFAULTER_FILES) $(DEFAULTER_GEN) $(RUN_GEN_DEFAULTER) -.PHONY: verify_gen_deepcopy -verify_gen_defaulter: $(DEFAULTER_GEN) - $(RUN_GEN_DEFAULTER) --verify-only - # For each dir in DEFAULTER_DIRS, this establishes a dependency between the # output file and the input files that should trigger a rebuild. # @@ -551,10 +538,6 @@ RUN_GEN_CONVERSION = \ gen_conversion: $(CONVERSION_FILES) $(CONVERSION_GEN) $(RUN_GEN_CONVERSION) -.PHONY: verify_gen_conversion -verify_gen_conversion: $(CONVERSION_GEN) - $(RUN_GEN_CONVERSION) --verify-only - # Establish a dependency between the deps file and the dir. Whenever a dir # changes (files added or removed) the deps file will be considered stale. #