Update erlang.mk and disable `edoc` plugin

2 files changed, 71 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 9899ed33c6..3ad0a54dc5 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,8 @@ USAGES_ERL   = $(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML)))
 
 EXTRA_SOURCES += $(USAGES_ERL)
 
+ERLANG_MK_DISABLE_PLUGINS = edoc
+
 include erlang.mk
 
 COMPILE_FIRST = $(basename \
diff --git a/erlang.mk b/erlang.mk
index ab1dae2753..99b0752a6b 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -16,7 +16,7 @@
 
 ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
 
-ERLANG_MK_VERSION = 1.2.0-646-g8f925a4
+ERLANG_MK_VERSION = 1.2.0-646-g8f925a4-dirty
 
 # Core configuration.
 
@@ -4544,6 +4544,8 @@ distclean-deps:
 # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring protobuffs,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 # Verbosity.
 
 proto_verbose_0 = @echo " PROTO " $(filter %.proto,$(?F));
@@ -4573,6 +4575,8 @@ ebin/$(PROJECT).app:: $(sort $(call core_find,src/,*.proto))
 	$(if $(strip $?),$(call compile_proto,$?))
 endif
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
@@ -4794,6 +4798,8 @@ endif
 # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring asciidoc,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: asciidoc asciidoc-guide asciidoc-manual install-asciidoc distclean-asciidoc
 
 MAN_INSTALL_PATH ?= /usr/local/share/man
@@ -4838,9 +4844,13 @@ distclean:: distclean-asciidoc
 distclean-asciidoc:
 	$(gen_verbose) rm -rf doc/html/ doc/guide.pdf doc/man3/ doc/man7/
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2014-2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring bootstrap,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: bootstrap bootstrap-lib bootstrap-rel new list-templates
 
 # Core targets.
@@ -5238,9 +5248,13 @@ endif
 list-templates:
 	$(verbose) echo Available templates: $(sort $(patsubst tpl_%,%,$(filter tpl_%,$(.VARIABLES))))
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2014-2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring c_src,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: clean-c_src distclean-c_src-env
 
 # Configuration.
@@ -5358,9 +5372,13 @@ distclean-c_src-env:
 -include $(C_SRC_ENV)
 endif
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring ci,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: ci ci-setup distclean-kerl
 
 KERL ?= $(CURDIR)/kerl
@@ -5424,9 +5442,13 @@ distclean-kerl:
 	$(gen_verbose) rm -rf $(KERL)
 endif
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring ct,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: ct distclean-ct
 
 # Configuration.
@@ -5480,9 +5502,13 @@ $(foreach test,$(CT_SUITES),$(eval $(call ct_suite_target,$(test))))
 distclean-ct:
 	$(gen_verbose) rm -rf $(CURDIR)/logs/
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring dialyzer,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: plt distclean-plt dialyze
 
 # Configuration.
@@ -5524,9 +5550,13 @@ dialyze: $(DIALYZER_PLT)
 endif
 	$(verbose) dialyzer --no_native $(DIALYZER_DIRS) $(DIALYZER_OPTS)
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring edoc,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: distclean-edoc edoc
 
 # Configuration.
@@ -5547,9 +5577,13 @@ edoc: doc-deps
 distclean-edoc:
 	$(gen_verbose) rm -f doc/*.css doc/*.html doc/*.png doc/edoc-info
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2015, Erlang Solutions Ltd.
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring elvis,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: elvis distclean-elvis
 
 # Configuration.
@@ -5587,9 +5621,13 @@ elvis: $(ELVIS) $(ELVIS_CONFIG)
 distclean-elvis:
 	$(gen_verbose) rm -rf $(ELVIS)
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring erlydtl,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 # Configuration.
 
 DTL_FULL_PATH ?= 0
@@ -5619,9 +5657,13 @@ ebin/$(PROJECT).app:: $(sort $(call core_find,templates/,*.dtl))
 	$(if $(strip $?),$(call compile_erlydtl,$?))
 endif
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2014 Dave Cottlehuber <dch@skunkwerks.at>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring escript,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: distclean-escript escript
 
 # Configuration.
@@ -5684,10 +5726,14 @@ escript:: distclean-escript deps app
 distclean-escript:
 	$(gen_verbose) rm -f $(ESCRIPT_NAME)
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2014, Enrique Fernandez <enrique.fernandez@erlang-solutions.com>
 # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is contributed to erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring eunit,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: eunit
 
 # Configuration
@@ -5735,9 +5781,13 @@ eunit: test-build
 	$(gen_verbose) $(ERL) -pa $(TEST_DIR) $(DEPS_DIR)/*/ebin ebin \
 		-eval "$(subst $(newline),,$(subst ",\",$(call eunit.erl,$(EUNIT_MODS))))"
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring relx,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: relx-rel distclean-relx-rel distclean-relx run
 
 # Configuration.
@@ -5807,9 +5857,13 @@ help::
 
 endif
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2014, M Robert Martin <rob@version2beta.com>
 # This file is contributed to erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring shell,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: shell
 
 # Configuration.
@@ -5836,9 +5890,13 @@ build-shell-deps: $(ALL_SHELL_DEPS_DIRS)
 shell: build-shell-deps
 	$(gen_verbose) erl $(SHELL_PATH) $(SHELL_OPTS)
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring triq,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 ifneq ($(wildcard $(DEPS_DIR)/triq),)
 .PHONY: triq
 
@@ -5879,9 +5937,13 @@ triq: test-build
 endif
 endif
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright (c) 2015, Erlang Solutions Ltd.
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring xref,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 .PHONY: xref distclean-xref
 
 # Configuration.
@@ -5918,9 +5980,13 @@ xref: deps app $(XREFR)
 distclean-xref:
 	$(gen_verbose) rm -rf $(XREFR)
 
+endif # ERLANG_MK_DISABLE_PLUGINS
+
 # Copyright 2015, Viktor Söderqvist <viktor@zuiderkwast.se>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
+ifeq ($(findstring cover,$(ERLANG_MK_DISABLE_PLUGINS)),)
+
 COVER_REPORT_DIR = cover
 
 # Hook in coverage to ct
@@ -6038,3 +6104,5 @@ cover-report:
 
 endif
 endif # ifneq ($(COVER_REPORT_DIR),)
+
+endif # ERLANG_MK_DISABLE_PLUGINS