github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
Kubernetes Submit Queue 2016-08-23 00:19:14 -07:00 committed by GitHub
parent 13305ef0ff af13e1d325
commit 570f5a7d99
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -278,4 +278,4 @@ $(notdir $(abspath $(wildcard federation/cmd/*/))): generated_files
# make generated_files
.PHONY: generated_files
generated_files:
$(MAKE) -f Makefile.$@ $@
$(MAKE) -f Makefile.$@ $@ CALLED_FROM_MAIN_MAKEFILE=1

6
Makefile.generated_files
View File

@ -12,6 +12,12 @@
# See the License for the specific language governing permissions and
# 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.
ifeq ($(MAKECMDGOALS),)
$(error This Makefile requires an explicit rule to be specified)