aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2019-09-28 21:22:53 +0200
committerlynxis lazus <lynxis@fe80.eu>2019-10-03 19:51:03 +0000
commite30f19542bcfa3493dc428a638580f34c773081b (patch)
tree0b0e8d0e05185d5324b4405a9c0bcdc7ebf9607d
parenta8f782502b48f685464a287c01306af225fa7ec5 (diff)
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
-rw-r--r--src/sgsn/Makefile.am7
-rw-r--r--src/sgsn/gprs_ranap.c4
-rw-r--r--tests/sgsn/Makefile.am4
3 files changed, 7 insertions, 8 deletions
diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am
index 8bc1abb8..6a7392ba 100644
--- a/src/sgsn/Makefile.am
+++ b/src/sgsn/Makefile.am
@@ -45,8 +45,6 @@ osmo_sgsn_SOURCES = \
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 @@ osmo_sgsn_LDADD += \
$(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 b0d0f8df..d2b34554 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 @@ int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id,
return rc;
}
-#endif
diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am
index bdcd9b47..b72c4463 100644
--- a/tests/sgsn/Makefile.am
+++ b/tests/sgsn/Makefile.am
@@ -44,13 +44,11 @@ sgsn_test_LDFLAGS = \
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 @@ sgsn_test_LDADD = \
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) \