File 0808-snmp-agent-Ensure-behaviour-modules-are-bu... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0808-snmp-agent-Ensure-behaviour-modules-are-built-first.patch of Package erlang

From 05050cc86ea31728f55b2df037f2183798816206 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 5 Nov 2019 17:25:13 +0100
Subject: [PATCH 3/3] [snmp|agent] Ensure behaviour modules are built first

---
 lib/snmp/src/agent/Makefile   | 27 ++++++++++++++++++---------
 lib/snmp/src/agent/modules.mk |  1 -
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
index 2943a4d550..1bde1ca972 100644
--- a/lib/snmp/src/agent/Makefile
+++ b/lib/snmp/src/agent/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2016. All Rights Reserved.
+# Copyright Ericsson AB 1996-2019. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,11 +43,12 @@ RELSYSDIR = $(RELEASE_PATH)/lib/snmp-$(VSN)
 
 include modules.mk
 
-ERL_FILES = $(MODULES:%=%.erl)
+ERL_FILES = $(BEHAVIOUR_MODULES:%=%.erl) $(MODULES:%=%.erl)
 
 HRL_FILES = $(INTERNAL_HRL_FILES:%=%.hrl)
 
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+BEHAVIOUR_TARGET_FILES = $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
+TARGET_FILES =           $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 
 # ----------------------------------------------------
@@ -101,20 +102,28 @@ ERL_COMPILE_FLAGS += -I../../include \
 debug:
 	@$(MAKE) TYPE=debug opt
 
-opt: $(TARGET_FILES) 
+opt:
+	@$(MAKE) behaviour_targets
+	@$(MAKE) targets
+
+behaviour_targets: $(BEHAVIOUR_TARGET_FILES)
+
+targets: $(TARGET_FILES) 
 
 
 clean:
-	rm -f $(TARGET_FILES) 
+	rm -f $(BEHAVIOUR_TARGET_FILES)
+	rm -f $(TARGET_FILES)
 	rm -f core *~
 
 docs:
 
 info:
-	@echo "SNMP_FLAGS:        $(SNMP_FLAGS)"
-	@echo "ERL_COMPILE_FLAGS: $(ERL_COMPILE_FLAGS)"
+	@echo "SNMP_FLAGS:             $(SNMP_FLAGS)"
+	@echo "ERL_COMPILE_FLAGS:      $(ERL_COMPILE_FLAGS)"
 	@echo ""
-	@echo "TARGET_FILES:      $(TARGET_FILES)"
+	@echo "BEHAVIOUR_TARGET_FILES: $(BEHAVIOUR_TARGET_FILES)"
+	@echo "TARGET_FILES:           $(TARGET_FILES)"
 	@echo ""
 
 
@@ -133,7 +142,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/agent"
 	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
 		"$(RELSYSDIR)/ebin"
 # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 # 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
diff --git a/lib/snmp/src/agent/modules.mk b/lib/snmp/src/agent/modules.mk
index 49cc158c2e..39c9aca1cd 100644
--- a/lib/snmp/src/agent/modules.mk
+++ b/lib/snmp/src/agent/modules.mk
@@ -49,7 +49,6 @@ MIB_MODULES = \
 MODULES = \
 	snmpa \
 	$(MIB_MODULES) \
-	$(BEHAVIOUR_MODULES) \
 	snmpa_acm \
 	snmpa_agent \
 	snmpa_agent_sup \
-- 
2.16.4

Places

File 0808-snmp-agent-Ensure-behaviour-modules-are-built-first.patch of Package erlang

Places