github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51052 from thockin/makefile-whitespace

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51113, 46597, 50397, 51052, 51166)

Makefile cleanups

Cleaned up while debugging elsewhere.
This commit is contained in:
Kubernetes Submit Queue 2017-08-23 23:16:32 -07:00 committed by GitHub
commit 7cc582f9e4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/root/Makefile.generated_files
View File

@ -222,7 +222,7 @@ RUN_GEN_DEEPCOPY = \
--v $(KUBE_VERBOSE) \ --v $(KUBE_VERBOSE) \
--logtostderr \ --logtostderr \
-i $$(cat $(META_DIR)/$(DEEPCOPY_GEN).todo | paste -sd, -) \ -i $$(cat $(META_DIR)/$(DEEPCOPY_GEN).todo | paste -sd, -) \
--bounding-dirs $(PRJ_SRC_PATH),,"k8s.io/api" \ --bounding-dirs $(PRJ_SRC_PATH),"k8s.io/api" \
-O $(DEEPCOPY_BASENAME) \ -O $(DEEPCOPY_BASENAME) \
"$$@"; \ "$$@"; \
fi \ fi \
@ -503,15 +503,15 @@ $(foreach dir, $(OPENAPI_DIRS), $(eval \
# How to regenerate open-api code. This emits a single file for all results. # How to regenerate open-api code. This emits a single file for all results.
$(OPENAPI_OUTFILE): $(OPENAPI_GEN) $(OPENAPI_GEN) $(OPENAPI_OUTFILE): $(OPENAPI_GEN) $(OPENAPI_GEN)
function run_gen_openapi() { \ function run_gen_openapi() { \
./hack/run-in-gopath.sh $(OPENAPI_GEN) \ ./hack/run-in-gopath.sh $(OPENAPI_GEN) \
--v $(KUBE_VERBOSE) \ --v $(KUBE_VERBOSE) \
--logtostderr \ --logtostderr \
-i $$(echo $(addprefix $(PRJ_SRC_PATH)/, $(OPENAPI_DIRS)) | sed 's/ /,/g') \ -i $$(echo $(addprefix $(PRJ_SRC_PATH)/, $(OPENAPI_DIRS)) | sed 's/ /,/g') \
-p $(PRJ_SRC_PATH)/$(OPENAPI_OUTPUT_PKG) \ -p $(PRJ_SRC_PATH)/$(OPENAPI_OUTPUT_PKG) \
-O $(OPENAPI_BASENAME) \ -O $(OPENAPI_BASENAME) \
"$$@"; \ "$$@"; \
}; \ }; \
run_gen_openapi run_gen_openapi
# This calculates the dependencies for the generator tool, so we only rebuild # This calculates the dependencies for the generator tool, so we only rebuild
# it when needed. It is PHONY so that it always runs, but it only updates the # it when needed. It is PHONY so that it always runs, but it only updates the