Change in ...osmo-sgsn[master]: Improve build without IU

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

lynxis lazus gerrit-no-reply at lists.osmocom.org
Sat Sep 28 19:40:11 UTC 2019


lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15618


Change subject: Improve build without IU
......................................................................

Improve build 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, 8 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/18/15618/1

diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am
index 8bc1abb..31ea298 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..28f72c9 100644
--- a/src/sgsn/gprs_ranap.c
+++ b/src/sgsn/gprs_ranap.c
@@ -21,10 +21,8 @@
  *
  */
 
+
 #include "bscconfig.h"
-
-#ifdef BUILD_IU
-
 #include <gtp.h>
 
 #include <osmocom/core/rate_ctr.h>
@@ -220,4 +218,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: 1
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190928/f8bc2233/attachment.htm>


More information about the gerrit-log mailing list