Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ledest:erlang:19
erlang
0807-snmp-manager-Ensure-behaviour-modules-are-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0807-snmp-manager-Ensure-behaviour-modules-are-built-firs.patch of Package erlang
From 25a8d36c6430bc53264c00cebdac0c0bbf884b35 Mon Sep 17 00:00:00 2001 From: Micael Karlberg <bmk@erlang.org> Date: Tue, 5 Nov 2019 17:24:09 +0100 Subject: [PATCH 2/3] [snmp|manager] Ensure behaviour modules are built first --- lib/snmp/src/manager/Makefile | 25 +++++++++++++++++-------- lib/snmp/src/manager/modules.mk | 3 +-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile index 0cc87492f1..57ff08c160 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2004-2016. All Rights Reserved. +# Copyright Ericsson AB 2004-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)) # ---------------------------------------------------- @@ -90,19 +91,27 @@ 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 $(BEHAVIOUR_TARGET_FILES) rm -f $(TARGET_FILES) rm -f core *~ docs: info: - @echo "ERL_FILES: $(ERL_FILES)" - @echo "HRL_FILES: $(HRL_FILES)" - @echo "TARGET_FILES: $(TARGET_FILES)" + @echo "ERL_FILES: $(ERL_FILES)" + @echo "HRL_FILES: $(HRL_FILES)" + @echo "BEHAVIOUR_TARGET_FILES: $(BEHAVIOUR_TARGET_FILES)" + @echo "TARGET_FILES: $(TARGET_FILES)" @echo "" @@ -116,7 +125,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" # $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/manager/modules.mk b/lib/snmp/src/manager/modules.mk index ea9b52d653..7ff8745ec7 100644 --- a/lib/snmp/src/manager/modules.mk +++ b/lib/snmp/src/manager/modules.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2004-2016. All Rights Reserved. +# Copyright Ericsson AB 2004-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. @@ -25,7 +25,6 @@ BEHAVIOUR_MODULES = \ snmpm_network_interface_filter MODULES = \ - $(BEHAVIOUR_MODULES) \ snmpm \ snmpm_conf \ snmpm_config \ -- 2.16.4
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor