<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15618">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Avoid compiling unneeded files when building without Iu<br><br>Remove gprs_ranap.c and gprs_mm_state_iu_fsm.c<br>from the Makefile when building without IU.<br><br>Change-Id: I2386f8e86bbf0b87eedce9f57eb86b1b64998a69<br>---<br>M src/sgsn/Makefile.am<br>M src/sgsn/gprs_ranap.c<br>M tests/sgsn/Makefile.am<br>3 files changed, 7 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am</span><br><span>index 8bc1abb..6a7392b 100644</span><br><span>--- a/src/sgsn/Makefile.am</span><br><span>+++ b/src/sgsn/Makefile.am</span><br><span>@@ -45,8 +45,6 @@</span><br><span> gprs_gmm.c \</span><br><span> gprs_gmm_fsm.c \</span><br><span> gprs_mm_state_gb_fsm.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_mm_state_iu_fsm.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ranap.c \</span><br><span> gprs_sgsn.c \</span><br><span> gprs_sm.c \</span><br><span> gprs_sndcp.c \</span><br><span>@@ -87,4 +85,9 @@</span><br><span> $(LIBOSMORANAP_LIBS) \</span><br><span> $(LIBASN1C_LIBS) \</span><br><span> $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_sgsn_SOURCES += \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_mm_state_iu_fsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ranap.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif</span><br><span>diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c</span><br><span>index b0d0f8d..d2b3455 100644</span><br><span>--- a/src/sgsn/gprs_ranap.c</span><br><span>+++ b/src/sgsn/gprs_ranap.c</span><br><span>@@ -22,9 +22,6 @@</span><br><span> */</span><br><span> </span><br><span> #include "bscconfig.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef BUILD_IU</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <gtp.h></span><br><span> </span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span>@@ -220,4 +217,3 @@</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span>diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am</span><br><span>index bdcd9b4..b72c446 100644</span><br><span>--- a/tests/sgsn/Makefile.am</span><br><span>+++ b/tests/sgsn/Makefile.am</span><br><span>@@ -44,13 +44,11 @@</span><br><span> sgsn_test_LDADD = \</span><br><span> $(top_builddir)/src/sgsn/gprs_llc.o \</span><br><span> $(top_builddir)/src/sgsn/gprs_gb.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/sgsn/gprs_ranap.o \</span><br><span> $(top_builddir)/src/sgsn/gprs_sndcp.o \</span><br><span> $(top_builddir)/src/sgsn/gprs_gmm_attach.o \</span><br><span> $(top_builddir)/src/sgsn/gprs_gmm.o \</span><br><span> $(top_builddir)/src/sgsn/gprs_gmm_fsm.o \</span><br><span> $(top_builddir)/src/sgsn/gprs_mm_state_gb_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/sgsn/gprs_mm_state_iu_fsm.o \</span><br><span> $(top_builddir)/src/sgsn/gprs_sgsn.o \</span><br><span> $(top_builddir)/src/sgsn/sgsn_vty.o \</span><br><span> $(top_builddir)/src/sgsn/sgsn_libgtp.o \</span><br><span>@@ -82,6 +80,8 @@</span><br><span> </span><br><span> if BUILD_IU</span><br><span> sgsn_test_LDADD += \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_ranap.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_mm_state_iu_fsm.o \</span><br><span> $(LIBOSMORANAP_LIBS) \</span><br><span> $(LIBOSMOSIGTRAN_LIBS) \</span><br><span> $(LIBASN1C_LIBS) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15618">change 15618</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15618"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2386f8e86bbf0b87eedce9f57eb86b1b64998a69 </div>
<div style="display:none"> Gerrit-Change-Number: 15618 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>