diff options
| author | Micael Karlberg <[email protected]> | 2011-02-24 18:46:52 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-02-24 18:46:52 +0100 |
| commit | 8d66da63859f1dae9339d1b13f37b0982c052133 (patch) | |
| tree | 540f81d0a507f0eb92084b6c91f28be2809f7fd8 /lib/snmp/mibs/Makefile.in | |
| parent | 25bff78c1650c156b31772bf8072441f4edf3759 (diff) | |
| parent | 205d55b2ee2afe70a9cbac6da15c8b985c76f2ab (diff) | |
| download | otp-8d66da63859f1dae9339d1b13f37b0982c052133.tar.gz otp-8d66da63859f1dae9339d1b13f37b0982c052133.tar.bz2 otp-8d66da63859f1dae9339d1b13f37b0982c052133.zip | |
[compiler] Added support for the textual convention
AGENT-CAPABILITIES and full support for textual convention
MODULE-COMPLIANCE, both defined by the SNMPv2-CONF mib.
The *reference* and *modules* part(s) are stored in the
assocList field of the mib-entry (me) record.
Only handled if the option(s) agent_capabilities and
module_compliance (respectively) are provided to the
compiler.
For backward compatibillity, the MIBs provided with
this application are *not* compiled with these options.
Merge branch 'bmk/snmp/add_compiler_support_agent_capabilities/OTP-8966' into bmk/snmp/snmp419_integration/OTP-9068
Conflicts:
lib/snmp/test/snmp_compiler_test.erl
Diffstat (limited to 'lib/snmp/mibs/Makefile.in')
| -rw-r--r-- | lib/snmp/mibs/Makefile.in | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in index b85a8b0767..7aefb0ea34 100644 --- a/lib/snmp/mibs/Makefile.in +++ b/lib/snmp/mibs/Makefile.in @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 1996-2009. All Rights Reserved. +# Copyright Ericsson AB 1996-2011. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -108,20 +108,28 @@ TARGET_FILES = \ # FLAGS # ---------------------------------------------------- -SNMP_FLAGS += -pa ../ebin +version +SNMP_FLAGS += -pa ../ebin +version ifneq ($(MIBS_VERBOSITY),) -SNMP_FLAGS += +'{verbosity,$(MIBS_VERBOSITY)}' +SNMP_FLAGS += +'{verbosity, $(MIBS_VERBOSITY)}' endif -ifneq ($(MIBS_REFERENCE),) +ifeq ($(MIBS_REFERENCE),true) SNMP_FLAGS += +reference endif -ifneq ($(MIBS_OPTIONS),) +ifeq ($(MIBS_OPTIONS),true) SNMP_FLAGS += +options endif +ifeq ($(MIBS_MC),true) +SNMP_FLAGS += +module_compliance +endif + +ifeq ($(MIBS_AC),true) +SNMP_FLAGS += +agent_capabilities +endif + # ---------------------------------------------------- # Targets @@ -148,6 +156,14 @@ conf: cd ..; $(MAKE) conf info: + @echo "MIBS_REFERENCE = $(MIBS_REFERENCE)" + @echo "" + @echo "MIBS_OPTIONS = $(MIBS_OPTIONS)" + @echo "" + @echo "MIBS_MC = $(MIBS_MC)" + @echo "" + @echo "MIBS_AC = $(MIBS_AC)" + @echo "" @echo "SNMP_FLAGS = $(SNMP_FLAGS)" @echo "" @echo "MIBS = $(MIBS)" |