Skip to content

K
k3s
Commit 570f5a7d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #31161 from thockin/makefile-defense

Automatic merge from submit-queue Error if someone uses the sub-makefile directly Produce a more helpful failure when someone errantly uses the generated_files makefile directly.
parents 13305ef0 af13e1d3
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
Makefile
View file @ 570f5a7d
...@@ -278,4 +278,4 @@ $(notdir $(abspath $(wildcard federation/cmd/*/))): generated_files ...@@ -278,4 +278,4 @@ $(notdir $(abspath $(wildcard federation/cmd/*/))): generated_files
# make generated_files # make generated_files
.PHONY: generated_files .PHONY: generated_files
generated_files: generated_files:
$(MAKE) -f Makefile.$@ $@ $(MAKE) -f Makefile.$@ $@ CALLED_FROM_MAIN_MAKEFILE=1
Makefile.generated_files
View file @ 570f5a7d
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Don't allow users to call this directly. There are too many variables this
# assumes to inherit from the main Makefile. This is not a user-facing file.
ifeq ($(CALLED_FROM_MAIN_MAKEFILE),)
$(error Please use the main Makefile, e.g. `make generated_files`)
endif
# Don't allow an implicit 'all' rule. This is not a user-facing file. # Don't allow an implicit 'all' rule. This is not a user-facing file.
ifeq ($(MAKECMDGOALS),) ifeq ($(MAKECMDGOALS),)
$(error This Makefile requires an explicit rule to be specified) $(error This Makefile requires an explicit rule to be specified)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment