<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15360">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/gprs/Makefile.am: Move build of shared .c files to an internal lib<br><br>Build files shared by osmo-sgsn, osmo-gbpy and osmo-gtphub into a .la<br>library, so we can later split each application into its own subdir and<br>clearly identify what's used by who.<br><br>Due to a dependency error with .Po files, I cannot depend on the specific<br>.o files directly in LDADD for each binary, but it works fine on follow up<br>commits when binaries are splitted into different makefiles, so it will be<br>done later.<br><br>Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6<br>---<br>M .gitignore<br>M debian/copyright<br>M src/gprs/Makefile.am<br>3 files changed, 27 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index 3480380..70193ff 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -2,6 +2,7 @@</span><br><span> *.o</span><br><span> *.lo</span><br><span> *.a</span><br><span style="color: hsl(120, 100%, 40%);">+*.la</span><br><span> .deps</span><br><span> Makefile</span><br><span> Makefile.in</span><br><span>diff --git a/debian/copyright b/debian/copyright</span><br><span>index 4e53664..b9bc8e0 100644</span><br><span>--- a/debian/copyright</span><br><span>+++ b/debian/copyright</span><br><span>@@ -81,17 +81,19 @@</span><br><span> include/osmocom/sgsn/gprs_utils.h</span><br><span> include/osmocom/sgsn/gtphub.h</span><br><span> include/osmocom/sgsn/signal.h</span><br><span style="color: hsl(120, 100%, 40%);">+ src/gprs/gprs_llc_parse.c</span><br><span> src/gprs/crc24.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/gprs/gprs_gb_parse.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/gprs/gprs_utils.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/gprs/sgsn_ares.c</span><br><span> src/gprs/gb_proxy.c</span><br><span> src/gprs/gb_proxy_main.c</span><br><span> src/gprs/gb_proxy_patch.c</span><br><span> src/gprs/gb_proxy_peer.c</span><br><span> src/gprs/gb_proxy_tlli.c</span><br><span> src/gprs/gb_proxy_vty.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_gb_parse.c</span><br><span> src/gprs/gprs_gmm.c</span><br><span> src/gprs/gprs_llc.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_llc_parse.c</span><br><span> src/gprs/gprs_llc_vty.c</span><br><span> src/gprs/gprs_llc_xid.c</span><br><span> src/gprs/gprs_sgsn.c</span><br><span>@@ -102,11 +104,9 @@</span><br><span> src/gprs/gprs_sndcp_vty.c</span><br><span> src/gprs/gprs_sndcp_xid.c</span><br><span> src/gprs/gprs_subscriber.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_utils.c</span><br><span> src/gprs/gtphub.c</span><br><span> src/gprs/gtphub_main.c</span><br><span> src/gprs/gtphub_vty.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/sgsn_ares.c</span><br><span> src/gprs/sgsn_auth.c</span><br><span> src/gprs/sgsn_cdr.c</span><br><span> src/gprs/sgsn_ctrl.c</span><br><span>diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am</span><br><span>index 05d5b4c..0471bfe 100644</span><br><span>--- a/src/gprs/Makefile.am</span><br><span>+++ b/src/gprs/Makefile.am</span><br><span>@@ -35,6 +35,25 @@</span><br><span> $(LIBGTP_LIBS) \</span><br><span> $(NULL)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+noinst_LTLIBRARIES = libcommon.la</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+libcommon_la_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_gb_parse.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_llc_parse.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ crc24.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_utils.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ares.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+libcommon_la_LIBADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOVTY_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBGTP_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOSIGTRAN_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBCARES_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bin_PROGRAMS = \</span><br><span> osmo-gbproxy \</span><br><span> osmo-sgsn \</span><br><span>@@ -49,12 +68,9 @@</span><br><span> gb_proxy_patch.c \</span><br><span> gb_proxy_tlli.c \</span><br><span> gb_proxy_peer.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_gb_parse.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_llc_parse.c \</span><br><span style="color: hsl(0, 100%, 40%);">- crc24.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_utils.c \</span><br><span> $(NULL)</span><br><span> osmo_gbproxy_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ libcommon.la \</span><br><span> $(OSMO_LIBS) \</span><br><span> -lrt \</span><br><span> $(NULL)</span><br><span>@@ -77,20 +93,17 @@</span><br><span> sgsn_vty.c \</span><br><span> sgsn_libgtp.c \</span><br><span> gprs_llc.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_llc_parse.c \</span><br><span> gprs_llc_vty.c \</span><br><span style="color: hsl(0, 100%, 40%);">- crc24.c \</span><br><span> sgsn_ctrl.c \</span><br><span> sgsn_auth.c \</span><br><span> gprs_subscriber.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_utils.c \</span><br><span> sgsn_cdr.c \</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_ares.c \</span><br><span> slhc.c \</span><br><span> gprs_llc_xid.c \</span><br><span> v42bis.c \</span><br><span> $(NULL)</span><br><span> osmo_sgsn_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ libcommon.la \</span><br><span> $(OSMO_LIBS) \</span><br><span> $(LIBOSMOABIS_LIBS) \</span><br><span> $(LIBOSMOGSUPCLIENT_LIBS) \</span><br><span>@@ -113,10 +126,9 @@</span><br><span> gtphub_sock.c \</span><br><span> gtphub_ares.c \</span><br><span> gtphub_vty.c \</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_ares.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_utils.c \</span><br><span> $(NULL)</span><br><span> osmo_gtphub_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ libcommon.la \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span> $(LIBOSMOVTY_LIBS) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15360">change 15360</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/+/15360"/><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: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6 </div>
<div style="display:none"> Gerrit-Change-Number: 15360 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>