File 3091-otp-Fix-make-TYPE-TYPE-to-work-for-all-typ... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3091-otp-Fix-make-TYPE-TYPE-to-work-for-all-types.patch of Package erlang

From dda051ea1d6f24ae47da4f5fdcd581c4c505b262 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 4 Jan 2022 17:44:08 +0100
Subject: [PATCH 11/11] otp: Fix `make TYPE=$TYPE` to work for all types

diff --git a/erts/Makefile b/erts/Makefile
index cc0637dee9..512db02fd8 100644
--- a/erts/Makefile
+++ b/erts/Makefile
@@ -41,7 +41,7 @@ docs:
 	$(V_at)( cd doc/src && $(MAKE) $@ )
 
 .PHONY: debug opt lcnt clean test
-debug opt lcnt clean:
+$(TYPES) clean:
 	$(V_at)for d in emulator $(ERTSDIRS); do \
 		if test -d $$d; then \
 			( cd $$d && $(MAKE) $@ ) || exit $$?; \
@@ -57,7 +57,7 @@ test:
 
 .PHONY: $(FLAVORS)
 $(FLAVORS):
-	$(V_at)for type in $(TYPES); do \
+	$(V_at)for type in $(DEFAULT_TYPES); do \
 		( $(MAKE) FLAVOR=$@ $$type ) || exit $$?; \
 	done
 
@@ -150,7 +150,7 @@ makefiles:
 .PHONY: release
 release:
 ifeq ($(TYPE),)
-	for t in $(TYPES); do \
+	for t in $(DEFAULT_TYPES); do \
 	  ( cd emulator && $(MAKE) release TYPE=$$t ) || exit $$?; \
 	done
 else
diff --git a/erts/configure b/erts/configure
index 7d0aa2d1eb..ad5908cbbd 100755
--- a/erts/configure
+++ b/erts/configure
@@ -682,7 +682,7 @@ EMU_THR_DEFS
 EMU_THR_LIBS
 EMU_THR_X_LIBS
 EMU_THR_LIB_NAME
-TYPES
+DEFAULT_TYPES
 DIRTY_SCHEDULER_TEST
 ETHR_X86_SSE2_ASM
 ETHR_THR_LIB_BASE_DIR
@@ -15015,7 +15015,7 @@ if test "X$ETHR_LIB_NAME" = "X"; then
    as_fn_error $? "cannot build emulator since no thread library was found" "$LINENO" 5
 fi
 
-TYPES=opt
+DEFAULT_TYPES="opt"
 
 DIRTY_SCHEDULER_TEST=$enable_dirty_schedulers_test
 
@@ -15259,7 +15259,7 @@ printf %s "checking whether lock counters should be enabled... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lock_count" >&5
 $as_echo "$enable_lock_count" >&6; }
 if test "x$enable_lock_count" != "xno"; then
-    TYPES="$TYPES lcnt"
+    DEFAULT_TYPES="$DEFAULT_TYPES lcnt"
 fi
 
 case $host_os in
diff --git a/erts/configure.in b/erts/configure.in
index e3b368e2b8..9a0766d34d 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1012,7 +1012,7 @@ if test "X$ETHR_LIB_NAME" = "X"; then
    AC_MSG_ERROR([cannot build emulator since no thread library was found])
 fi
 
-TYPES=opt
+DEFAULT_TYPES="opt"
 
 DIRTY_SCHEDULER_TEST=$enable_dirty_schedulers_test
 AC_SUBST(DIRTY_SCHEDULER_TEST)
@@ -1091,7 +1091,7 @@ EOF
 	;;
 
 esac
-AC_SUBST(TYPES)
+AC_SUBST(DEFAULT_TYPES)
 
 AC_CHECK_FUNCS([posix_fadvise closefrom])
 AC_CHECK_HEADERS([linux/falloc.h])
@@ -1178,7 +1178,7 @@ fi
 AC_MSG_CHECKING(whether lock counters should be enabled)
 AC_MSG_RESULT($enable_lock_count)
 if test "x$enable_lock_count" != "xno"; then
-    TYPES="$TYPES lcnt"
+    DEFAULT_TYPES="$DEFAULT_TYPES lcnt"
 fi
 
 case $host_os in
diff --git a/erts/etc/Makefile b/erts/etc/Makefile
index 788dfff132..8c9649b045 100644
--- a/erts/etc/Makefile
+++ b/erts/etc/Makefile
@@ -18,6 +18,7 @@
 # %CopyrightEnd%
 #
 include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 SUB_DIRECTORIES = common
 ifeq ($(TARGET),win32)
diff --git a/erts/etc/unix/Makefile b/erts/etc/unix/Makefile
index bd1c6d5411..b4d5b5e280 100644
--- a/erts/etc/unix/Makefile
+++ b/erts/etc/unix/Makefile
@@ -24,7 +24,7 @@ include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 
-opt debug lcnt: etc
+$(TYPES): etc
 
 .PHONY: etc
 etc: etp-commands
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
index 8fb3360f83..d784f6b560 100644
--- a/lib/asn1/c_src/Makefile
+++ b/lib/asn1/c_src/Makefile
@@ -99,7 +99,8 @@ _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
 opt: $(NIF_SHARED_OBJ_FILE)
 
-debug: opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 static_lib: $(NIF_LIB_FILE)
 
diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
index 60a2020dbf..7b37353380 100644
--- a/lib/asn1/src/Makefile
+++ b/lib/asn1/src/Makefile
@@ -108,7 +108,7 @@ YRL_FLAGS =
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+$(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 
 clean:
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index a9dd66251c..63d00fde40 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -147,7 +147,7 @@ EBIN = .
 $(EMAKEFILE): $(ERL_FILES) $(HRL_FILES)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(ERL_FILES) >$(EMAKEFILE)
 
-tests debug opt: $(EMAKEFILE)
+tests $(TYPES): $(EMAKEFILE)
 
 clean:
 	rm -f core
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
index 7d7b5ed203..4720a8c705 100644
--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
@@ -133,7 +133,7 @@ APPUP_FILE= common_test.appup
 APPUP_SRC= $(APPUP_FILE).src
 APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
-tests debug opt: $(TARGET_FILES)
+tests $(TYPES): $(TARGET_FILES)
 
 docs:
 
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 8b4222f79f..69eb17c369 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -112,7 +112,7 @@ EBIN = .
 #	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
 #	> $(EMAKEFILE)
 
-tests debug opt:
+tests $(TYPES):
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/common_test/test_server/Makefile b/lib/common_test/test_server/Makefile
index 3f68417c4c..a49502a057 100644
--- a/lib/common_test/test_server/Makefile
+++ b/lib/common_test/test_server/Makefile
@@ -64,7 +64,7 @@ ERL_COMPILE_FLAGS += -I../include -Werror
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(TS_TARGETS)
+tests $(TYPES): $(TS_TARGETS)
 
 clean:
 	rm -f $(TS_TARGET_FILES)
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index b7dcb275ea..652fd5bc78 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -141,7 +141,7 @@ ERL_COMPILE_FLAGS += +inline +warn_unused_import \
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 docs:
 
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 5ee52c7cb3..9783359fbb 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -202,7 +202,7 @@ make_emakefile: $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) $(NO_SSA_OPT_ERL_FILES
 	$(ERL_TOP)/make/make_emakefile +dialyzer $(ERL_COMPILE_FLAGS) \
 	  -o$(EBIN) $(DIALYZER_MODULES) >> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
index fea32dc4e3..d57cdd5464 100644
--- a/lib/crypto/src/Makefile
+++ b/lib/crypto/src/Makefile
@@ -61,7 +61,7 @@ ERL_COMPILE_FLAGS += -DCRYPTO_VSN=\"$(VSN)\" -Werror -I../include
 # Targets
 # ----------------------------------------------------
 
-debug opt valgrind asan: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+$(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:
 	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile
index c0f4a3e56c..a018b794c5 100644
--- a/lib/crypto/test/Makefile
+++ b/lib/crypto/test/Makefile
@@ -36,7 +36,7 @@ EBIN = .
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-tests opt debug: $(TARGET_FILES)
+tests $(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/debugger/priv/Makefile b/lib/debugger/priv/Makefile
index 726d7eb2f3..5cb7a82773 100644
--- a/lib/debugger/priv/Makefile
+++ b/lib/debugger/priv/Makefile
@@ -42,7 +42,7 @@ TOOLBAR_FILES = \
 # Rules
 #
 
-debug opt:
+$(TYPES):
 
 docs:
 
diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
index 118cb6b758..30324ec9d6 100644
--- a/lib/debugger/src/Makefile
+++ b/lib/debugger/src/Makefile
@@ -92,7 +92,7 @@ ERL_COMPILE_FLAGS += -Werror
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) $(TARGET_TOOLBOX_FILES)
+$(TYPES): $(TARGET_FILES) $(TARGET_TOOLBOX_FILES)
 
 clean:
 	rm -f $(TARGET_FILES) $(TARGET_TOOLBOX_FILES)
diff --git a/lib/debugger/test/Makefile b/lib/debugger/test/Makefile
index 8677180596..b3e167a50a 100644
--- a/lib/debugger/test/Makefile
+++ b/lib/debugger/test/Makefile
@@ -84,7 +84,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
 	>> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
index aac9ef899b..709311cd24 100644
--- a/lib/dialyzer/src/Makefile
+++ b/lib/dialyzer/src/Makefile
@@ -99,7 +99,7 @@ ERL_COMPILE_FLAGS += +warn_export_vars +warn_unused_import +warn_missing_spec
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 docs:
 
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 348cc350e1..f21384bd3c 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -146,8 +146,8 @@ patch:
 	git diff --exit-code HEAD
 	$(MAKE) opt PRE_VSN="-$(shell git rev-list --max-count=1 HEAD | cut -c 1-8)"
 
-debug:
-	@$(MAKE) TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 # The dictionary parser.
 gen/$(DICT_YRL).erl: compiler/$(DICT_YRL).yrl
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index c574d70e45..2e7b225aad 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -64,7 +64,7 @@ ERL_COMPILE_FLAGS += +warn_export_vars \
 # Targets
 # ----------------------------------------------------
 
-all debug opt: $(TARGET_FILES)
+all $(TYPES): $(TARGET_FILES)
 
 strict:
 	$(MAKE) opt STRICT_FLAGS=-Werror
diff --git a/lib/edoc/bin/Makefile b/lib/edoc/bin/Makefile
index d87c08356f..5885d244dc 100644
--- a/lib/edoc/bin/Makefile
+++ b/lib/edoc/bin/Makefile
@@ -49,7 +49,7 @@ ESCRIPT_FILES= \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt:
+$(TYPES):
 
 docs:
 
diff --git a/lib/edoc/doc/Makefile b/lib/edoc/doc/Makefile
index c635f07d78..0be38971c4 100644
--- a/lib/edoc/doc/Makefile
+++ b/lib/edoc/doc/Makefile
@@ -57,7 +57,7 @@ info:
 
 
 
-debug opt: 
+$(TYPES): 
 
 
 clean:
diff --git a/lib/edoc/include/Makefile b/lib/edoc/include/Makefile
index 6318253c27..a3bfd0568f 100644
--- a/lib/edoc/include/Makefile
+++ b/lib/edoc/include/Makefile
@@ -37,7 +37,7 @@ INCLUDE_FILES = edoc_doclet.hrl
 # ----------------------------------------------------
 # Make Rules
 # ----------------------------------------------------
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/edoc/priv/Makefile b/lib/edoc/priv/Makefile
index 45bff37b39..66846fad21 100644
--- a/lib/edoc/priv/Makefile
+++ b/lib/edoc/priv/Makefile
@@ -23,7 +23,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/edoc-$(EDOC_VSN)
 GEN_SCRIPT = edoc_generate
 PRIV_FILES = stylesheet.css erlang.png edoc.dtd
 
-debug opt:
+$(TYPES):
 
 clean:
 	rm -f core *~
diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
index 8acef15248..a455662049 100644
--- a/lib/edoc/src/Makefile
+++ b/lib/edoc/src/Makefile
@@ -49,7 +49,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(OBJECTS)
+$(TYPES): $(OBJECTS)
 
 all: $(OBJECTS)
 
diff --git a/lib/edoc/test/Makefile b/lib/edoc/test/Makefile
index ecc93e32be..80906a9456 100644
--- a/lib/edoc/test/Makefile
+++ b/lib/edoc/test/Makefile
@@ -40,7 +40,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
 	>> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
index b79a537424..60bf6900ab 100644
--- a/lib/eldap/src/Makefile
+++ b/lib/eldap/src/Makefile
@@ -67,8 +67,8 @@ ERL_COMPILE_FLAGS += -I../include -I../ebin -Werror
 # ----------------------------------------------------
 opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 clean:
 	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
diff --git a/lib/eldap/test/Makefile b/lib/eldap/test/Makefile
index 81fa8f187a..899272a8b4 100644
--- a/lib/eldap/test/Makefile
+++ b/lib/eldap/test/Makefile
@@ -61,7 +61,7 @@ EBIN = .
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(TARGET_FILES)
+tests $(TYPES): $(TARGET_FILES)
 
 
 clean:
diff --git a/lib/erl_docgen/priv/bin/Makefile b/lib/erl_docgen/priv/bin/Makefile
index 9ccb84b9c6..798ef5b98e 100644
--- a/lib/erl_docgen/priv/bin/Makefile
+++ b/lib/erl_docgen/priv/bin/Makefile
@@ -50,7 +50,7 @@ ESCRIPT_FILES= \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: 
+$(TYPES): 
 
 docs:
 
diff --git a/lib/erl_docgen/priv/css/Makefile b/lib/erl_docgen/priv/css/Makefile
index 7f24128753..82a5385b0f 100644
--- a/lib/erl_docgen/priv/css/Makefile
+++ b/lib/erl_docgen/priv/css/Makefile
@@ -51,7 +51,7 @@ CSS_FILES = \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: 
+$(TYPES): 
 
 DOC_TARGETS?=html
 
diff --git a/lib/erl_docgen/priv/dtd/Makefile b/lib/erl_docgen/priv/dtd/Makefile
index bed1827dac..184d25980c 100644
--- a/lib/erl_docgen/priv/dtd/Makefile
+++ b/lib/erl_docgen/priv/dtd/Makefile
@@ -70,7 +70,7 @@ ENT_FILES = \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: 
+$(TYPES): 
 
 docs:
 
diff --git a/lib/erl_docgen/priv/dtd_html_entities/Makefile b/lib/erl_docgen/priv/dtd_html_entities/Makefile
index c0026bd04d..ec81b5ba0b 100644
--- a/lib/erl_docgen/priv/dtd_html_entities/Makefile
+++ b/lib/erl_docgen/priv/dtd_html_entities/Makefile
@@ -49,7 +49,7 @@ ENTITY_FILES = \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: 
+$(TYPES): 
 
 docs:
 
diff --git a/lib/erl_docgen/priv/dtd_man_entities/Makefile b/lib/erl_docgen/priv/dtd_man_entities/Makefile
index c634417e8c..79e2bacd7b 100644
--- a/lib/erl_docgen/priv/dtd_man_entities/Makefile
+++ b/lib/erl_docgen/priv/dtd_man_entities/Makefile
@@ -49,7 +49,7 @@ ENTITY_FILES = \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: 
+$(TYPES): 
 
 docs:
 
diff --git a/lib/erl_docgen/priv/images/Makefile b/lib/erl_docgen/priv/images/Makefile
index 03d3e19997..fd67695d8b 100644
--- a/lib/erl_docgen/priv/images/Makefile
+++ b/lib/erl_docgen/priv/images/Makefile
@@ -52,7 +52,7 @@ PNG_FILES = \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: 
+$(TYPES): 
 
 DOC_TARGETS?=html
 
diff --git a/lib/erl_docgen/priv/js/flipmenu/Makefile b/lib/erl_docgen/priv/js/flipmenu/Makefile
index 030b1fa052..c104241cc6 100644
--- a/lib/erl_docgen/priv/js/flipmenu/Makefile
+++ b/lib/erl_docgen/priv/js/flipmenu/Makefile
@@ -54,7 +54,7 @@ JS_FILES = \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: 
+$(TYPES): 
 
 DOC_TARGETS?=html
 
diff --git a/lib/erl_docgen/priv/xsl/Makefile b/lib/erl_docgen/priv/xsl/Makefile
index d381bd4cf7..50b341debb 100644
--- a/lib/erl_docgen/priv/xsl/Makefile
+++ b/lib/erl_docgen/priv/xsl/Makefile
@@ -56,7 +56,7 @@ XSL_FILES = \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: 
+$(TYPES): 
 
 docs:
 
diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
index e4339dcb1f..a73248d1b5 100644
--- a/lib/erl_docgen/src/Makefile
+++ b/lib/erl_docgen/src/Makefile
@@ -66,7 +66,7 @@ ERL_COMPILE_FLAGS += -I../../xmerl/include
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/erl_docgen/test/Makefile b/lib/erl_docgen/test/Makefile
index 9e58157023..fe45b2a684 100644
--- a/lib/erl_docgen/test/Makefile
+++ b/lib/erl_docgen/test/Makefile
@@ -39,7 +39,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
 	>> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/erl_interface/src/Makefile b/lib/erl_interface/src/Makefile
index 6b5e2c1e61..86467c0ea8 100644
--- a/lib/erl_interface/src/Makefile
+++ b/lib/erl_interface/src/Makefile
@@ -26,12 +26,10 @@
 include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 
-debug opt shared gcov:
+debug opt shared gcov lcnt valgrind asan:
 ifndef TERTIARY_BOOTSTRAP
 	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile TYPE=$@
 endif
 
 clean depend docs release release_docs tests release_tests check xmllint:
 	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile $@
-
-lcnt:
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index 204408ee22..8ba08c1fd0 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -408,7 +408,10 @@ MDD_EIOBJECTS  = $(addprefix $(MDD_OBJDIR)/,$(notdir $(EISOURCES:.c=.o)))
 # FIXME this assumes execution order
 # FIXME move up and add exe prefix if needed....
 
-debug opt: $(TARGETS)
+opt: $(TARGETS)
+
+debug lcnt asan valgrind gcov:
+	@${MAKE} TYPE=$@
 
 docs:
 
diff --git a/lib/erl_interface/test/Makefile b/lib/erl_interface/test/Makefile
index bdfedecc66..fa26c7f69c 100644
--- a/lib/erl_interface/test/Makefile
+++ b/lib/erl_interface/test/Makefile
@@ -58,7 +58,7 @@ RELSYSDIR = $(RELEASE_PATH)/erl_interface_test
 # Targets
 # ----------------------------------------------------
 
-tests debug opt:
+tests $(TYPES):
 
 clean:
 
diff --git a/lib/et/examples/Makefile b/lib/et/examples/Makefile
index fe6811e45d..569aef17fb 100644
--- a/lib/et/examples/Makefile
+++ b/lib/et/examples/Makefile
@@ -61,7 +61,7 @@ EBIN = .
 # ----------------------------------------------------
 # Make Rules
 # ----------------------------------------------------
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES) *~
diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
index b6347d8b6d..352b72f773 100644
--- a/lib/et/src/Makefile
+++ b/lib/et/src/Makefile
@@ -76,8 +76,8 @@ ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/et/ebin -I../include -Werror
 # Targets
 # ----------------------------------------------------
 
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
diff --git a/lib/et/test/Makefile b/lib/et/test/Makefile
index 45ea2c2ce0..2f0c2e0625 100644
--- a/lib/et/test/Makefile
+++ b/lib/et/test/Makefile
@@ -56,7 +56,7 @@ EBIN = .
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(TARGET_FILES)
+tests $(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/eunit/examples/Makefile b/lib/eunit/examples/Makefile
index 01620746f5..23433e1a70 100644
--- a/lib/eunit/examples/Makefile
+++ b/lib/eunit/examples/Makefile
@@ -37,7 +37,7 @@ EXAMPLE_FILES = fib.erl tests.txt
 # ----------------------------------------------------
 # Make Rules
 # ----------------------------------------------------
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
index 32f75202a0..4ec5af6988 100644
--- a/lib/eunit/src/Makefile
+++ b/lib/eunit/src/Makefile
@@ -73,7 +73,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
 $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
 
-debug opt: $(PARSE_TRANSFORM_BIN) $(OBJECTS)
+$(TYPES): $(PARSE_TRANSFORM_BIN) $(OBJECTS)
 
 docs:
 
diff --git a/lib/eunit/test/Makefile b/lib/eunit/test/Makefile
index 0889f31b54..39e2ef6802 100644
--- a/lib/eunit/test/Makefile
+++ b/lib/eunit/test/Makefile
@@ -57,7 +57,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) \
 		$(MODULES) > $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/ftp/src/Makefile b/lib/ftp/src/Makefile
index 93e3c4a8e5..443556eedb 100644
--- a/lib/ftp/src/Makefile
+++ b/lib/ftp/src/Makefile
@@ -83,7 +83,7 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
 
 $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
+$(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
 
 clean:
 	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES) 
diff --git a/lib/inets/examples/httpd_load_test/Makefile b/lib/inets/examples/httpd_load_test/Makefile
index 8b1b654593..94b8d4b04a 100644
--- a/lib/inets/examples/httpd_load_test/Makefile
+++ b/lib/inets/examples/httpd_load_test/Makefile
@@ -77,8 +77,8 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) 
 
diff --git a/lib/inets/examples/server_root/Makefile b/lib/inets/examples/server_root/Makefile
index d11389f0a7..08dbe5817a 100644
--- a/lib/inets/examples/server_root/Makefile
+++ b/lib/inets/examples/server_root/Makefile
@@ -163,7 +163,7 @@ ERL_COMPILE_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-debug opt: 
+$(TYPES): 
 
 clean:
 
diff --git a/lib/inets/priv/Makefile b/lib/inets/priv/Makefile
index ddd35e8625..1fa46b9b7f 100644
--- a/lib/inets/priv/Makefile
+++ b/lib/inets/priv/Makefile
@@ -46,7 +46,7 @@ ERL_COMPILE_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-debug opt: 
+$(TYPES): 
 
 clean:
 
diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
index a1c1f36b70..e622dd7eab 100644
--- a/lib/inets/src/http_client/Makefile
+++ b/lib/inets/src/http_client/Makefile
@@ -77,7 +77,7 @@ ERL_COMPILE_FLAGS += \
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
index 8248e37c44..367a83e056 100644
--- a/lib/inets/src/http_lib/Makefile
+++ b/lib/inets/src/http_lib/Makefile
@@ -73,7 +73,7 @@ ERL_COMPILE_FLAGS += \
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
index f66a446d40..1c59758e7b 100644
--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
@@ -117,7 +117,7 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES)
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index d85df269ce..7c270ae504 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -86,7 +86,7 @@ ERL_COMPILE_FLAGS += \
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index 84ccecb5e3..c3bf17efd4 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -210,7 +210,7 @@ ERL_COMPILE_FLAGS += \
 # 1) INETS_PRIV_DIR must be created
 # ----------------------------------------------------
 
-tests debug opt: $(BUILDTARGET) 
+tests $(TYPES): $(BUILDTARGET) 
 
 targets: $(TARGET_FILES)
 
diff --git a/lib/inets/test/httpd_test_data/server_root/Makefile b/lib/inets/test/httpd_test_data/server_root/Makefile
index ed4d63a3bb..1fdf9d2287 100644
--- a/lib/inets/test/httpd_test_data/server_root/Makefile
+++ b/lib/inets/test/httpd_test_data/server_root/Makefile
@@ -163,7 +163,7 @@ ERL_COMPILE_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-debug opt: 
+$(TYPES): 
 
 clean:
 
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
index e42fd9468d..f1970c528d 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -100,7 +100,7 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/lib/jinterface/vsn.mk
 $(APPUP_TARGET): $(APPUP_SRC) $(ERL_TOP)/lib/jinterface/vsn.mk
 	$(vsn_verbose)sed -e 's;%VSN%;$(JINTERFACE_VSN);' $< > $@
 
-debug opt: make_dirs $(JAVA_DEST_ROOT)$(JARFILE)
+$(TYPES): make_dirs $(JAVA_DEST_ROOT)$(JARFILE)
 
 make_dirs:
 	$(V_at)if [ ! -d "$(JAVA_DEST_ROOT)" ];then mkdir "$(JAVA_DEST_ROOT)"; fi
diff --git a/lib/jinterface/test/Makefile b/lib/jinterface/test/Makefile
index 3eff11e4f7..33e7e410f0 100644
--- a/lib/jinterface/test/Makefile
+++ b/lib/jinterface/test/Makefile
@@ -58,7 +58,7 @@ TARGET_FILES = \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-tests debug opt:
+tests $(TYPES):
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/kernel/examples/Makefile b/lib/kernel/examples/Makefile
index 21f3f26cf7..2356bbf602 100644
--- a/lib/kernel/examples/Makefile
+++ b/lib/kernel/examples/Makefile
@@ -29,7 +29,7 @@ include ../vsn.mk
 # Targets
 # ----------------------------------------------------
 
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index b2299188eb..8243d3ec44 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -188,7 +188,7 @@ ERL_COMPILE_FLAGS += -I../include
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) 
+$(TYPES): $(TARGET_FILES) 
 
 # Note: In the open-source build clean must not destroyed the preloaded
 # beam files.
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 020f34c68b..925314f713 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -183,7 +183,7 @@ make_emakefile: $(ERL_FILES)
 	  $(MODULES) $(STDLIB_MODULES) \
 	>> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/megaco/examples/meas/Makefile.in b/lib/megaco/examples/meas/Makefile.in
index 4ff5cd2703..1dc3361167 100644
--- a/lib/megaco/examples/meas/Makefile.in
+++ b/lib/megaco/examples/meas/Makefile.in
@@ -95,8 +95,8 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) 
 
diff --git a/lib/megaco/examples/simple/Makefile b/lib/megaco/examples/simple/Makefile
index 00c0b7e65e..41d9721cf3 100644
--- a/lib/megaco/examples/simple/Makefile
+++ b/lib/megaco/examples/simple/Makefile
@@ -105,8 +105,8 @@ endif
 # ----------------------------------------------------
 opt: $(TARGET_FILES) 
 
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 clean:
 	rm -f $(TARGET_FILES) 
diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile
index ab45548099..156614bcda 100644
--- a/lib/megaco/src/app/Makefile
+++ b/lib/megaco/src/app/Makefile
@@ -74,8 +74,8 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
index 9e33fe3ae5..26c2c1b6b0 100644
--- a/lib/megaco/src/binary/Makefile
+++ b/lib/megaco/src/binary/Makefile
@@ -100,8 +100,8 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: prebuild $(TARGET_FILES) 
 
diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile
index 869b516b05..3aa562b8e3 100644
--- a/lib/megaco/src/engine/Makefile
+++ b/lib/megaco/src/engine/Makefile
@@ -74,8 +74,8 @@ ERL_COMPILE_FLAGS += \
 
 $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
 
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) 
 
diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
index cd409fa54f..250ceed039 100644
--- a/lib/megaco/src/flex/Makefile.in
+++ b/lib/megaco/src/flex/Makefile.in
@@ -187,9 +187,9 @@ endif
 # ----------------------------------------------------
 
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
-debug opt: $(TARGET_FILES) $(C_TARGETS) solibs
+$(TYPES): $(TARGET_FILES) $(C_TARGETS) solibs
 else
-debug opt: $(TARGET_FILES) 
+$(TYPES): $(TARGET_FILES) 
 endif
 
 clean:
diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile
index d07db3fa4b..9968a1b655 100644
--- a/lib/megaco/src/tcp/Makefile
+++ b/lib/megaco/src/tcp/Makefile
@@ -67,8 +67,8 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) 
 
diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
index bb5f80403b..33d9dd03c4 100644
--- a/lib/megaco/src/text/Makefile
+++ b/lib/megaco/src/text/Makefile
@@ -81,8 +81,8 @@ endif
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES)
 
diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile
index 028a63e98e..bc74473eab 100644
--- a/lib/megaco/src/udp/Makefile
+++ b/lib/megaco/src/udp/Makefile
@@ -66,8 +66,8 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) 
 
diff --git a/lib/megaco/test/Makefile b/lib/megaco/test/Makefile
index 0ea33883db..ac983d2657 100644
--- a/lib/megaco/test/Makefile
+++ b/lib/megaco/test/Makefile
@@ -128,7 +128,7 @@ endif
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(BUILDTARGET)
+tests $(TYPES): $(BUILDTARGET)
 
 targets: $(TARGET_FILES)
 
diff --git a/lib/mnesia/examples/Makefile b/lib/mnesia/examples/Makefile
index 5580f0bdcb..4c23945967 100644
--- a/lib/mnesia/examples/Makefile
+++ b/lib/mnesia/examples/Makefile
@@ -66,7 +66,7 @@ EBIN = .
 # ----------------------------------------------------
 # Make Rules
 # ----------------------------------------------------
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES) *~
diff --git a/lib/mnesia/include/Makefile b/lib/mnesia/include/Makefile
index 6eed4d716f..c82f6a5d39 100644
--- a/lib/mnesia/include/Makefile
+++ b/lib/mnesia/include/Makefile
@@ -42,7 +42,7 @@ INCLUDE_FILES =
 # ----------------------------------------------------
 # Make Rules
 # ----------------------------------------------------
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
index dce7a359d3..bd2a49f0e9 100644
--- a/lib/mnesia/src/Makefile
+++ b/lib/mnesia/src/Makefile
@@ -106,8 +106,8 @@ ERL_COMPILE_FLAGS += \
 
 opt: $(TARGET_FILES)
 
-debug:
-	@${MAKE} TYPE=debug
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
index b77be46e7a..956e07d97e 100644
--- a/lib/mnesia/test/Makefile
+++ b/lib/mnesia/test/Makefile
@@ -98,7 +98,7 @@ EBIN = .
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(TARGET_FILES)
+tests $(TYPES): $(TARGET_FILES)
 
 $(TARGET_FILES): $(HRL_FILES)
 
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index 4280557d45..0868a6bd53 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -128,7 +128,7 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-opt debug: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/observer/test/Makefile b/lib/observer/test/Makefile
index 1dc7a7e11b..8c7ca2fcfc 100644
--- a/lib/observer/test/Makefile
+++ b/lib/observer/test/Makefile
@@ -68,7 +68,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) \
 		$(MODULES) > $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
index 7ca59495ed..9d709e4c50 100644
--- a/lib/odbc/src/Makefile
+++ b/lib/odbc/src/Makefile
@@ -83,7 +83,7 @@ ERL_COMPILE_FLAGS += -I$(INCLUDE) \
 #debug:
 #	@${MAKE} TYPE=debug opt
 
-debug opt:	$(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+$(TYPES):	$(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/odbc/test/Makefile b/lib/odbc/test/Makefile
index c90f76a83d..6842e77164 100644
--- a/lib/odbc/test/Makefile
+++ b/lib/odbc/test/Makefile
@@ -76,7 +76,7 @@ ERL_COMPILE_FLAGS += $(INCLUDES) \
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(BUILDTARGET)
+tests $(TYPES): $(BUILDTARGET)
 
 targets: $(TARGET_FILES)
 
diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
index 48a896265b..1f25dd3bcb 100644
--- a/lib/os_mon/src/Makefile
+++ b/lib/os_mon/src/Makefile
@@ -65,7 +65,7 @@ ERL_COMPILE_FLAGS += -I$(INCLUDE) -Werror
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/os_mon/test/Makefile b/lib/os_mon/test/Makefile
index 73618e5fae..e592ae2f62 100644
--- a/lib/os_mon/test/Makefile
+++ b/lib/os_mon/test/Makefile
@@ -64,7 +64,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
 	> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
index ba206904ec..20142f5a02 100644
--- a/lib/parsetools/src/Makefile
+++ b/lib/parsetools/src/Makefile
@@ -66,7 +66,7 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/stdlib/include \
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/parsetools/test/Makefile b/lib/parsetools/test/Makefile
index 046b29067b..1657d4accc 100644
--- a/lib/parsetools/test/Makefile
+++ b/lib/parsetools/test/Makefile
@@ -54,7 +54,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
 	> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
index 1fef168463..02903a2d84 100644
--- a/lib/public_key/asn1/Makefile
+++ b/lib/public_key/asn1/Makefile
@@ -73,7 +73,7 @@ ASN_FLAGS = -bber +der +noobj +asn1config
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) $(HRL_FILES)
+$(TYPES): $(TARGET_FILES) $(HRL_FILES)
 
 clean:
 	-rm -f $(ASN_ERLS) $(GEN_ERLS) $(ASN_HRLS) $(HRL_FILES) $(ASN_DBS) \
diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
index e27f02eea9..4146860831 100644
--- a/lib/public_key/src/Makefile
+++ b/lib/public_key/src/Makefile
@@ -85,7 +85,7 @@ ERL_COMPILE_FLAGS += $(PUB_KEY_ERL_FLAGS) \
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(HRL_FILES)
+$(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(HRL_FILES)
 
 $(EBIN)/pubkey_ssh.$(EMULATOR): pubkey_moduli.hrl
 
diff --git a/lib/public_key/test/Makefile b/lib/public_key/test/Makefile
index 89e82a5f34..489104ee26 100644
--- a/lib/public_key/test/Makefile
+++ b/lib/public_key/test/Makefile
@@ -63,7 +63,7 @@ EBIN = .
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(TARGET_FILES)
+tests $(TYPES): $(TARGET_FILES)
 
 
 clean:
diff --git a/lib/reltool/examples/Makefile b/lib/reltool/examples/Makefile
index cc29c88ba3..f2a91da800 100644
--- a/lib/reltool/examples/Makefile
+++ b/lib/reltool/examples/Makefile
@@ -60,7 +60,7 @@ EBIN = .
 # ----------------------------------------------------
 # Make Rules
 # ----------------------------------------------------
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES) *~
diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
index 4bddee4664..6ef63a7cf4 100644
--- a/lib/reltool/src/Makefile
+++ b/lib/reltool/src/Makefile
@@ -65,8 +65,8 @@ ERL_COMPILE_FLAGS += +'{parse_transform,sys_pre_attributes}' \
 # Targets
 # ----------------------------------------------------
 
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
diff --git a/lib/reltool/test/Makefile b/lib/reltool/test/Makefile
index 838e9a34f6..5a034766b8 100644
--- a/lib/reltool/test/Makefile
+++ b/lib/reltool/test/Makefile
@@ -58,7 +58,7 @@ EBIN = .
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(TARGET_FILES)
+tests $(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index 76286c5499..95789e094c 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -79,7 +79,7 @@ ERL_COMPILE_FLAGS += \
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/runtime_tools/test/Makefile b/lib/runtime_tools/test/Makefile
index 6b0763f263..f899d53f7f 100644
--- a/lib/runtime_tools/test/Makefile
+++ b/lib/runtime_tools/test/Makefile
@@ -42,7 +42,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
 	> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/sasl/examples/src/Makefile b/lib/sasl/examples/src/Makefile
index e8b903f252..eaf940ac22 100644
--- a/lib/sasl/examples/src/Makefile
+++ b/lib/sasl/examples/src/Makefile
@@ -51,7 +51,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -fr $(TARGET_FILES) *~ *.beam 
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index 16a42caf11..2dfb21c39b 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -69,7 +69,7 @@ ERL_COMPILE_FLAGS += -I../../stdlib/include -Werror
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/sasl/test/Makefile b/lib/sasl/test/Makefile
index 1ea70319bd..d42e477188 100644
--- a/lib/sasl/test/Makefile
+++ b/lib/sasl/test/Makefile
@@ -71,7 +71,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
 	>> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/snmp/examples/ex1/Makefile b/lib/snmp/examples/ex1/Makefile
index a3d02ea778..d57a8a35ea 100644
--- a/lib/snmp/examples/ex1/Makefile
+++ b/lib/snmp/examples/ex1/Makefile
@@ -67,7 +67,7 @@ TARGET_FILES= \
 # Targets
 # ----------------------------------------------------
 
-debug opt: build
+$(TYPES): build
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/snmp/examples/ex2/Makefile b/lib/snmp/examples/ex2/Makefile
index 624a1df2ee..39a2a384fd 100644
--- a/lib/snmp/examples/ex2/Makefile
+++ b/lib/snmp/examples/ex2/Makefile
@@ -69,7 +69,7 @@ TARGET_FILES= \
 # Targets
 # ----------------------------------------------------
 
-debug opt: build
+$(TYPES): build
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in
index 6419009a6a..7be10f1f59 100644
--- a/lib/snmp/mibs/Makefile.in
+++ b/lib/snmp/mibs/Makefile.in
@@ -127,7 +127,7 @@ endif
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1: $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1.src
 	$(gen_verbose)$(PERL) -p -e 's?%PERL%?$(PERL)? ' < $< > $@
diff --git a/lib/snmp/priv/conf/agent/Makefile b/lib/snmp/priv/conf/agent/Makefile
index e905f55999..904a785ae7 100644
--- a/lib/snmp/priv/conf/agent/Makefile
+++ b/lib/snmp/priv/conf/agent/Makefile
@@ -44,7 +44,7 @@ include files.mk
 # Targets
 # ----------------------------------------------------
 
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/snmp/priv/conf/manager/Makefile b/lib/snmp/priv/conf/manager/Makefile
index 27024c171f..86a0feacfb 100644
--- a/lib/snmp/priv/conf/manager/Makefile
+++ b/lib/snmp/priv/conf/manager/Makefile
@@ -44,7 +44,7 @@ include files.mk
 # Targets
 # ----------------------------------------------------
 
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
index 1da0f33c9d..16bf11efdd 100644
--- a/lib/snmp/src/agent/Makefile
+++ b/lib/snmp/src/agent/Makefile
@@ -110,8 +110,8 @@ ERL_COMPILE_FLAGS += -I../../include \
 # Targets
 # ----------------------------------------------------
 
-debug:
-	@$(MAKE) TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt:
 	@$(MAKE) behaviour_targets
diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
index 02800462a4..69104aad26 100644
--- a/lib/snmp/src/app/Makefile
+++ b/lib/snmp/src/app/Makefile
@@ -109,8 +109,8 @@ ERL_COMPILE_FLAGS += -I../misc \
 # Targets
 # ----------------------------------------------------
 
-debug:
-	@$(MAKE) TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
index bbd7f99378..4dc6f3c95e 100644
--- a/lib/snmp/src/compile/Makefile
+++ b/lib/snmp/src/compile/Makefile
@@ -90,8 +90,8 @@ YRL_FLAGS = -o .
 # Targets
 # ----------------------------------------------------
 
-debug:
-	@${MAKE} TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES)
 
diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile
index 6f5f5d01f9..65c89d7258 100644
--- a/lib/snmp/src/manager/Makefile
+++ b/lib/snmp/src/manager/Makefile
@@ -100,8 +100,8 @@ ERL_COMPILE_FLAGS += -I../../include \
 # Targets
 # ----------------------------------------------------
 
-debug:
-	@$(MAKE) TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt:
 	@$(MAKE) behaviour_targets
diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile
index eca2d949d2..55027a7a7a 100644
--- a/lib/snmp/src/misc/Makefile
+++ b/lib/snmp/src/misc/Makefile
@@ -100,8 +100,8 @@ ERL_COMPILE_FLAGS += -I../../include \
 # Targets
 # ----------------------------------------------------
 
-debug:
-	@$(MAKE) TYPE=debug opt
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 opt: $(TARGET_FILES)
 
diff --git a/lib/snmp/test/Makefile b/lib/snmp/test/Makefile
index e9bd50f6d8..0b7ef89c7d 100644
--- a/lib/snmp/test/Makefile
+++ b/lib/snmp/test/Makefile
@@ -176,7 +176,7 @@ $(SNMP_BIN_TARGET_DIR)/%.hrl: $(SNMP_BIN_TARGET_DIR)/%.bin
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(BUILDTARGET)
+tests $(TYPES): $(BUILDTARGET)
 
 .PHONY: emakebuild
 
diff --git a/lib/snmp/test/test_config/Makefile b/lib/snmp/test/test_config/Makefile
index 1e53f51b83..6da986c63d 100644
--- a/lib/snmp/test/test_config/Makefile
+++ b/lib/snmp/test/test_config/Makefile
@@ -117,7 +117,7 @@ endif
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(TARGETS) 
+tests $(TYPES): $(TARGETS) 
 
 clean:
 	rm -f $(CONFIG_FILES)
diff --git a/lib/ssh/examples/Makefile b/lib/ssh/examples/Makefile
index d7d47eb3ae..5c279de425 100644
--- a/lib/ssh/examples/Makefile
+++ b/lib/ssh/examples/Makefile
@@ -56,7 +56,7 @@ EBIN = .
 # ----------------------------------------------------
 # Make Rules
 # ----------------------------------------------------
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 debug: ERLC_FLAGS += -Ddebug
 
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index f5ed6d78c3..b437b3f542 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -159,7 +159,7 @@ $(DEP_FILE): $(ERL_FILES)
 	| sed 's@^sshd_@$$(EBIN)/sshd_@' \
 	> $(DEP_FILE)
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(DEP_FILE)
+$(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(DEP_FILE)
 
 clean:
 	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES)
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index 54d20cf8db..6f1aecf25c 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -105,7 +105,7 @@ EBIN = .
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: emakebuild $(TARGET_FILES)
+tests $(TYPES): emakebuild $(TARGET_FILES)
 
 .PHONY: emakebuild
 
diff --git a/lib/ssl/examples/certs/Makefile b/lib/ssl/examples/certs/Makefile
index 5c456c6a1a..182e193b63 100644
--- a/lib/ssl/examples/certs/Makefile
+++ b/lib/ssl/examples/certs/Makefile
@@ -42,7 +42,7 @@ TARGET_FILES=
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -fr $(TARGET_FILES) *~ *.beam 
diff --git a/lib/ssl/examples/src/Makefile b/lib/ssl/examples/src/Makefile
index 7335bb2bb8..f0f5e85f17 100644
--- a/lib/ssl/examples/src/Makefile
+++ b/lib/ssl/examples/src/Makefile
@@ -51,7 +51,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+$(TYPES): $(TARGET_FILES)
 
 clean:
 	rm -fr $(TARGET_FILES) *~ *.beam 
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 2d28320ad0..793a678a57 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -173,7 +173,7 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
 # Targets
 # ----------------------------------------------------
 
-opt debug: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(DEP_FILE)
+$(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(DEP_FILE)
 
 deps: $(DEP_FILE)
 
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index 6e95b5732a..050ca0bae8 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -148,7 +148,7 @@ ERL_COMPILE_FLAGS += $(INCLUDES)
 # Targets
 # ----------------------------------------------------
 
-tests opt debug: $(BUILDTARGET)
+tests $(TYPES): $(BUILDTARGET)
 
 targets: $(TARGET_FILES)
 
diff --git a/lib/stdlib/examples/Makefile b/lib/stdlib/examples/Makefile
index 743ea87179..cbef038500 100644
--- a/lib/stdlib/examples/Makefile
+++ b/lib/stdlib/examples/Makefile
@@ -29,7 +29,7 @@ include ../vsn.mk
 # Targets
 # ----------------------------------------------------
 
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index 9890a20ee9..0939cf589c 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -169,7 +169,7 @@ ERL_COMPILE_FLAGS += -I../include -I../../kernel/include
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) 
+$(TYPES): $(TARGET_FILES) 
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index c3ec41d769..6b2711089b 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -130,7 +130,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(ERTS_MODULES) \
 	> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/syntax_tools/doc/Makefile b/lib/syntax_tools/doc/Makefile
index 87604c4e7f..87b7660c26 100644
--- a/lib/syntax_tools/doc/Makefile
+++ b/lib/syntax_tools/doc/Makefile
@@ -57,7 +57,7 @@ info:
 
 
 
-debug opt: 
+$(TYPES): 
 
 
 clean:
diff --git a/lib/syntax_tools/examples/Makefile b/lib/syntax_tools/examples/Makefile
index f5e96a8285..0712898f65 100644
--- a/lib/syntax_tools/examples/Makefile
+++ b/lib/syntax_tools/examples/Makefile
@@ -37,7 +37,7 @@ EXAMPLE_FILES = demo.erl
 # ----------------------------------------------------
 # Make Rules
 # ----------------------------------------------------
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
index af6a472f3d..dc0ac61734 100644
--- a/lib/syntax_tools/src/Makefile
+++ b/lib/syntax_tools/src/Makefile
@@ -50,7 +50,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(OBJECTS)
+$(TYPES): $(OBJECTS)
 
 all: $(OBJECTS)
 
diff --git a/lib/syntax_tools/test/Makefile b/lib/syntax_tools/test/Makefile
index 4ace860223..51fe2417b1 100644
--- a/lib/syntax_tools/test/Makefile
+++ b/lib/syntax_tools/test/Makefile
@@ -40,7 +40,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
 	>> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile
index 4ece9ffe28..e8f4a538b8 100644
--- a/lib/tftp/src/Makefile
+++ b/lib/tftp/src/Makefile
@@ -80,7 +80,7 @@ ERL_COMPILE_FLAGS += \
 
 $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+$(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:
 	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES)
diff --git a/lib/tftp/test/Makefile b/lib/tftp/test/Makefile
index 77ec425bac..c9705fff9b 100644
--- a/lib/tftp/test/Makefile
+++ b/lib/tftp/test/Makefile
@@ -161,7 +161,7 @@ ERL_COMPILE_FLAGS += \
 # 1) TFTP_PRIV_DIR must be created
 # ----------------------------------------------------
 
-tests debug opt: $(BUILDTARGET) 
+tests $(TYPES): $(BUILDTARGET) 
 
 targets: $(TARGET_FILES)
 
diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile
index c19ad3668c..279ae5f805 100644
--- a/lib/tools/emacs/Makefile
+++ b/lib/tools/emacs/Makefile
@@ -59,7 +59,7 @@ ELC_FILES = $(EMACS_FILES:%=%.elc)
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) $(EL_FILES)
+$(TYPES): $(TARGET_FILES) $(EL_FILES)
 
 clean:
 	rm -f $(TARGET_FILES) $(ELC_FILES)
diff --git a/lib/tools/examples/Makefile b/lib/tools/examples/Makefile
index 0fcc66d874..a5e0473f64 100644
--- a/lib/tools/examples/Makefile
+++ b/lib/tools/examples/Makefile
@@ -39,7 +39,7 @@ EXAMPLE_FILES = xref_examples.erl
 # Targets
 # ----------------------------------------------------
 
-debug opt:
+$(TYPES):
 
 clean:
 
diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
index cc5bee9a8f..3f18f8cce1 100644
--- a/lib/tools/src/Makefile
+++ b/lib/tools/src/Makefile
@@ -84,7 +84,7 @@ ERL_COMPILE_FLAGS += -Werror
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+$(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:
 	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
diff --git a/lib/tools/test/Makefile b/lib/tools/test/Makefile
index 350b936978..bf36fa1ea0 100644
--- a/lib/tools/test/Makefile
+++ b/lib/tools/test/Makefile
@@ -67,7 +67,7 @@ make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
 	> $(EMAKEFILE)
 
-tests debug opt: make_emakefile
+tests $(TYPES): make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/wx/Makefile b/lib/wx/Makefile
index 561ae45789..1938cd85a6 100644
--- a/lib/wx/Makefile
+++ b/lib/wx/Makefile
@@ -19,12 +19,12 @@
 #
 
 include ./vsn.mk
+include ./config.mk
 
 ifdef TERTIARY_BOOTSTRAP
  INSIDE_ERLSRC = true
  SUBDIRS = src
 else # Normal build
- include ./config.mk
  SUBDIRS = src
  ifeq ($(CAN_BUILD_DRIVER), true)
  SUBDIRS += c_src
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
index 8a638b740a..472504afc3 100644
--- a/lib/wx/c_src/Makefile.in
+++ b/lib/wx/c_src/Makefile.in
@@ -130,8 +130,8 @@ CXX_O_NO_OPT    = $(V_CXX) -c $(CXX_NO_OPT_FLAGS) $(WX_CXX_FLAGS)  $(COMMON_CFLA
 
 opt:     $(TARGET_DIR)/wxe_driver$(SO_EXT) $(TARGET_DIR)/erl_gl$(SO_EXT) $(WEBVIEW_LOADER_DLL_DEST)
 
-debug:   
-	@${MAKE} TYPE=debug
+$(filter-out opt, $(TYPES)):
+	@${MAKE} TYPE=$@ opt
 
 clean:  
 	rm -f $(OBJECTS) 
diff --git a/lib/wx/examples/demo/Makefile b/lib/wx/examples/demo/Makefile
index d1c2d23a71..e9aa3c998e 100644
--- a/lib/wx/examples/demo/Makefile
+++ b/lib/wx/examples/demo/Makefile
@@ -62,7 +62,7 @@ TESTTARGETS = $(TESTMODS:%=%.beam)
 TESTSRC = $(TESTMODS:%=%.erl)
 
 # Targets
-opt debug:	$(TESTTARGETS)
+$(TYPES):	$(TESTTARGETS)
 clean:
 	rm -f $(TESTTARGETS)
 	rm -f *~ core erl_crash.dump
diff --git a/lib/wx/examples/simple/Makefile b/lib/wx/examples/simple/Makefile
index 075528533a..1f028dde2b 100644
--- a/lib/wx/examples/simple/Makefile
+++ b/lib/wx/examples/simple/Makefile
@@ -31,7 +31,7 @@ TESTTARGETS = $(TESTMODS:%=%.beam)
 TESTSRC = $(TESTMODS:%=%.erl)
 
 # Targets
-opt debug:	$(TESTTARGETS)
+$(TYPES):	$(TESTTARGETS)
 clean:
 	rm -f $(TESTTARGETS)
 	rm -f *~ core erl_crash.dump
diff --git a/lib/wx/examples/sudoku/Makefile b/lib/wx/examples/sudoku/Makefile
index e6f35c689a..8d3f4fe958 100644
--- a/lib/wx/examples/sudoku/Makefile
+++ b/lib/wx/examples/sudoku/Makefile
@@ -31,7 +31,7 @@ TESTTARGETS = $(TESTMODS:%=%.beam)
 TESTSRC = $(TESTMODS:%=%.erl)
 
 # Targets
-opt debug:	$(TESTTARGETS)
+$(TYPES):	$(TESTTARGETS)
 clean:
 	rm -f $(TESTTARGETS)
 	rm -f *~ core erl_crash.dump
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
index 7e2eb38f2f..93c251a309 100644
--- a/lib/wx/src/Makefile
+++ b/lib/wx/src/Makefile
@@ -75,7 +75,7 @@ APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
 ifdef TERTIARY_BOOTSTRAP
  opt: $(EBIN)/wx_object.beam
 else
- debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+ $(TYPES): $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 endif
 
 clean:  
diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
index 51d9190797..b8909154a2 100644
--- a/lib/xmerl/src/Makefile
+++ b/lib/xmerl/src/Makefile
@@ -131,7 +131,7 @@ ERL_COMPILE_FLAGS += \
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-debug opt: $(TARGET_FILES) 
+$(TYPES): $(TARGET_FILES) 
 
 docs:
 #docs:	$(DOC_TARGET_FILES)
diff --git a/lib/xmerl/test/Makefile b/lib/xmerl/test/Makefile
index b90ca772af..2ec0e75c7b 100644
--- a/lib/xmerl/test/Makefile
+++ b/lib/xmerl/test/Makefile
@@ -92,7 +92,7 @@ ERL_COMPILE_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-tests debug opt:  xmerl_test.erl
+tests $(TYPES):  xmerl_test.erl
 
 info:
 	@echo "HRL_FILES: $(HRL_FILES)"
diff --git a/make/doc.mk b/make/doc.mk
index 9bc36ce86a..36256c1f05 100644
--- a/make/doc.mk
+++ b/make/doc.mk
@@ -129,7 +129,7 @@ info:
 	@echo "XML_CHAPTER_FILES:     $(XML_CHAPTER_FILES)"
 	@echo "BOOK_FILES:            $(BOOK_FILES)"
 
-debug opt lcnt:
+$(TYPES):
 
 clean clean_docs: clean_xml clean_pdf clean_html clean_man clean_chunks
 	rm -rf $(EXTRA_FILES)
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 2443c71a08..3c31ebec51 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -47,7 +47,8 @@ CROSS_COMPILING = @CROSS_COMPILING@
 # ----------------------------------------------------
 DEFAULT_TARGETS =  opt debug release release_docs clean docs
 
-TYPES = @TYPES@
+TYPES = opt debug lcnt valgrind asan gcov
+DEFAULT_TYPES = @DEFAULT_TYPES@
 FLAVORS = @FLAVORS@
 PRIMARY_FLAVOR= @PRIMARY_FLAVOR@
 
diff --git a/make/otp_subdir.mk b/make/otp_subdir.mk
index 6ccf727c75..c62932c8a9 100644
--- a/make/otp_subdir.mk
+++ b/make/otp_subdir.mk
@@ -19,13 +19,13 @@
 #
 # Make include file for otp
 
-.PHONY: debug opt lcnt release docs release_docs tests release_tests \
-	clean depend valgrind asan static_lib
+.PHONY: $(TYPES) release docs release_docs tests release_tests \
+	clean depend static_lib
 
 #
 # Targets that don't affect documentation directories
 #
-opt debug lcnt release docs release_docs tests release_tests clean depend valgrind asan static_lib xmllint:
+$(TYPES) release docs release_docs tests release_tests clean depend static_lib xmllint:
 	@set -e ;							\
 	app_pwd=`pwd` ;							\
 	if test -f vsn.mk; then						\
-- 
2.31.1

Places

File 3091-otp-Fix-make-TYPE-TYPE-to-work-for-all-types.patch of Package erlang

Places