12 files changed, 17 insertions, 17 deletions
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)