[snmp] Cleanup before removing the otp_mibs app

OTP-14984

1 files changed, 5 insertions, 27 deletions

diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in
index 2350194077..704d611619 100644
--- a/lib/snmp/mibs/Makefile.in
+++ b/lib/snmp/mibs/Makefile.in
@@ -41,14 +41,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/snmp-$(VSN)
 # Common macros
 # ----------------------------------------------------
 
-# NOTE: 
-#    The OTP-REG mib actually belongs to another
-#    application (otp_mibs), and is exported by this
-#    app. But since that app is built later, we have 
-#    to built it here in order to be able to build 
-#    OTP-SNMPEA-MIB (that needs otpModules and
-#    otpApplications).
-MIBS_A = \
+MIBS = \
 	RFC1213-MIB \
 	STANDARD-MIB \
 	SNMPv2-TM \
@@ -62,16 +55,9 @@ MIBS_A = \
 	SNMP-VIEW-BASED-ACM-MIB \
 	SNMP-USM-AES-MIB \
 	INET-ADDRESS-MIB \
-	TRANSPORT-ADDRESS-MIB
-
-MIBS_B = OTP-SNMPEA-MIB
-
-BUILD_MIBS = \
-	$(MIBS_A) \
+	TRANSPORT-ADDRESS-MIB \
 	OTP-REG \
-	$(MIBS_B)
-
-MIBS = $(MIBS_A) $(MIBS_B)
+	OTP-SNMPEA-MIB
 
 STD_v1_MIB_FILES = \
 	RFC1155-SMI.mib \
@@ -100,8 +86,8 @@ HRL_FILES = $(SNMP_HRL_TARGET_DIR)/SNMPv2-TC.hrl \
 
 TARGET_FILES = \
 	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 \
-	$(BUILD_MIBS:%=$(SNMP_BIN_TARGET_DIR)/%.bin) \
-	$(HRL_TARGETS)  \
+	$(MIBS:%=$(SNMP_BIN_TARGET_DIR)/%.bin) \
+	$(HRL_TARGETS) \
 	$(V1_MIB_FILES)
 
 
@@ -136,18 +122,12 @@ endif
 # Targets
 # ----------------------------------------------------
 
-OTP_MIBDIR = $(shell if test -d ../../otp_mibs; then echo otp_mibs; \
-		      else echo sasl; fi)
-
 debug opt: $(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)? ' < $< > $@
 	$(V_at)chmod 755 $@
 
-$(SNMP_BIN_TARGET_DIR)/OTP-REG.bin:	$(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-REG.mib
-	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
-
 # To support parallel make, we'll need explicit dependencies
 # to ensure that an imported MIB has been compiled when it's needed.
 
@@ -208,8 +188,6 @@ info:
 	@echo ""
 	@echo "TARGET_FILES = $(TARGET_FILES)"
 	@echo ""
-	@echo "OTP_MIBDIR   = $(OTP_MIBDIR)"
-	@echo ""
 	@echo "SNMP_VSN    = $(SNMP_VSN)"
 	@echo "VSN         = $(VSN)"
 	@echo "RELSYSDIR   = "$(RELSYSDIR)""