diff options
| author | Björn Gustavsson <[email protected]> | 2011-08-08 13:26:45 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-08-08 13:26:45 +0200 |
| commit | d95f24d2d3921461fc1c57f15fbaee7a4f149df4 (patch) | |
| tree | 93e8654badbe1812bd489b56f3ad184586045dc8 /lib/os_mon/mibs | |
| parent | 302b2a1bf0194ca81c7731699b75e4800f718955 (diff) | |
| parent | 542edfc2e267ba50cc948bb525d945244cf931f9 (diff) | |
| download | otp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.tar.gz otp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.tar.bz2 otp-d95f24d2d3921461fc1c57f15fbaee7a4f149df4.zip | |
Merge branch 'bjorn/parallel-make/OTP-9451' into major
* bjorn/parallel-make/OTP-9451: (28 commits)
erl_interface: Support parallel make
dialyzer: Remove special-case build in the top Makefile
pcre: Rename Makefile.in to pcre.mk and include it
cos*/src/Makefile: Support parallel make
ic: Support parallel make
orber: Support parallel make
.gitignore: Ignore IDL-GENERATED
public_key: Support parallel make
ssh: Support parallel make
os_mon: Support parallel make
diameter: Support parallel make
snmp: Support parallel make
megaco: Support parallel make
megaco/src/flex/Makefile.in: Support parallel make
*/c_src/Makefile*: Support parallel make
eunit: Support parallel make
gs: Support parallel make
common_test Makefile: Support parallel make
erts/emulator/Makefile.in: Support parallel make
erts: Fix dependency generation
...
Diffstat (limited to 'lib/os_mon/mibs')
| -rw-r--r-- | lib/os_mon/mibs/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/os_mon/mibs/Makefile b/lib/os_mon/mibs/Makefile index cbbc337491..a361fef378 100644 --- a/lib/os_mon/mibs/Makefile +++ b/lib/os_mon/mibs/Makefile @@ -78,6 +78,9 @@ $(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin: $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-MI v1/%.mib.v1: %.mib $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $< +$(SNMP_BIN_TARGET_DIR)/OTP-OS-MON-MIB.bin: \ + $(SNMP_BIN_TARGET_DIR)/OTP-REG.bin \ + $(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin \ # ---------------------------------------------------- # Release Target |