lynxis lazus has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/15618 )
Change subject: Avoid compiling unneeded files when building without Iu
......................................................................
Avoid compiling unneeded files when building without Iu
Remove gprs_ranap.c and gprs_mm_state_iu_fsm.c
from the Makefile when building without IU.
Change-Id: I2386f8e86bbf0b87eedce9f57eb86b1b64998a69
---
M src/sgsn/Makefile.am
M src/sgsn/gprs_ranap.c
M tests/sgsn/Makefile.am
3 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am
index 8bc1abb..6a7392b 100644
--- a/src/sgsn/Makefile.am
+++ b/src/sgsn/Makefile.am
@@ -45,8 +45,6 @@
gprs_gmm.c \
gprs_gmm_fsm.c \
gprs_mm_state_gb_fsm.c \
- gprs_mm_state_iu_fsm.c \
- gprs_ranap.c \
gprs_sgsn.c \
gprs_sm.c \
gprs_sndcp.c \
@@ -87,4 +85,9 @@
$(LIBOSMORANAP_LIBS) \
$(LIBASN1C_LIBS) \
$(NULL)
+
+osmo_sgsn_SOURCES += \
+ gprs_mm_state_iu_fsm.c \
+ gprs_ranap.c
+
endif
diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c
index b0d0f8d..d2b3455 100644
--- a/src/sgsn/gprs_ranap.c
+++ b/src/sgsn/gprs_ranap.c
@@ -22,9 +22,6 @@
*/
#include "bscconfig.h"
-
-#ifdef BUILD_IU
-
#include <gtp.h>
#include <osmocom/core/rate_ctr.h>
@@ -220,4 +217,3 @@
return rc;
}
-#endif
diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am
index bdcd9b4..b72c446 100644
--- a/tests/sgsn/Makefile.am
+++ b/tests/sgsn/Makefile.am
@@ -44,13 +44,11 @@
sgsn_test_LDADD = \
$(top_builddir)/src/sgsn/gprs_llc.o \
$(top_builddir)/src/sgsn/gprs_gb.o \
- $(top_builddir)/src/sgsn/gprs_ranap.o \
$(top_builddir)/src/sgsn/gprs_sndcp.o \
$(top_builddir)/src/sgsn/gprs_gmm_attach.o \
$(top_builddir)/src/sgsn/gprs_gmm.o \
$(top_builddir)/src/sgsn/gprs_gmm_fsm.o \
$(top_builddir)/src/sgsn/gprs_mm_state_gb_fsm.o \
- $(top_builddir)/src/sgsn/gprs_mm_state_iu_fsm.o \
$(top_builddir)/src/sgsn/gprs_sgsn.o \
$(top_builddir)/src/sgsn/sgsn_vty.o \
$(top_builddir)/src/sgsn/sgsn_libgtp.o \
@@ -82,6 +80,8 @@
if BUILD_IU
sgsn_test_LDADD += \
+ $(top_builddir)/src/sgsn/gprs_ranap.o \
+ $(top_builddir)/src/sgsn/gprs_mm_state_iu_fsm.o \
$(LIBOSMORANAP_LIBS) \
$(LIBOSMOSIGTRAN_LIBS) \
$(LIBASN1C_LIBS) \
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15618
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I2386f8e86bbf0b87eedce9f57eb86b1b64998a69
Gerrit-Change-Number: 15618
Gerrit-PatchSet: 4
Gerrit-Owner: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilira...@gmail.com>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
