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/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15360 ) Change subject: src/gprs/Makefile.am: Move build of shared .c files to an internal lib ...................................................................... src/gprs/Makefile.am: Move build of shared .c files to an internal lib Build files shared by osmo-sgsn, osmo-gbpy and osmo-gtphub into a .la library, so we can later split each application into its own subdir and clearly identify what's used by who. Due to a dependency error with .Po files, I cannot depend on the specific .o files directly in LDADD for each binary, but it works fine on follow up commits when binaries are splitted into different makefiles, so it will be done later. Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6 --- M .gitignore M debian/copyright M src/gprs/Makefile.am 3 files changed, 27 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 3480380..70193ff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.o *.lo *.a +*.la .deps Makefile Makefile.in diff --git a/debian/copyright b/debian/copyright index 4e53664..b9bc8e0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -81,17 +81,19 @@ include/osmocom/sgsn/gprs_utils.h include/osmocom/sgsn/gtphub.h include/osmocom/sgsn/signal.h + src/gprs/gprs_llc_parse.c src/gprs/crc24.c + src/gprs/gprs_gb_parse.c + src/gprs/gprs_utils.c + src/gprs/sgsn_ares.c src/gprs/gb_proxy.c src/gprs/gb_proxy_main.c src/gprs/gb_proxy_patch.c src/gprs/gb_proxy_peer.c src/gprs/gb_proxy_tlli.c src/gprs/gb_proxy_vty.c - src/gprs/gprs_gb_parse.c src/gprs/gprs_gmm.c src/gprs/gprs_llc.c - src/gprs/gprs_llc_parse.c src/gprs/gprs_llc_vty.c src/gprs/gprs_llc_xid.c src/gprs/gprs_sgsn.c @@ -102,11 +104,9 @@ src/gprs/gprs_sndcp_vty.c src/gprs/gprs_sndcp_xid.c src/gprs/gprs_subscriber.c - src/gprs/gprs_utils.c src/gprs/gtphub.c src/gprs/gtphub_main.c src/gprs/gtphub_vty.c - src/gprs/sgsn_ares.c src/gprs/sgsn_auth.c src/gprs/sgsn_cdr.c src/gprs/sgsn_ctrl.c diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 05d5b4c..0471bfe 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -35,6 +35,25 @@ $(LIBGTP_LIBS) \ $(NULL) +noinst_LTLIBRARIES = libcommon.la + +libcommon_la_SOURCES = \ + gprs_gb_parse.c \ + gprs_llc_parse.c \ + crc24.c \ + gprs_utils.c \ + sgsn_ares.c \ + $(NULL) + +libcommon_la_LIBADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBGTP_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBCARES_LIBS) \ + $(NULL) + bin_PROGRAMS = \ osmo-gbproxy \ osmo-sgsn \ @@ -49,12 +68,9 @@ gb_proxy_patch.c \ gb_proxy_tlli.c \ gb_proxy_peer.c \ - gprs_gb_parse.c \ - gprs_llc_parse.c \ - crc24.c \ - gprs_utils.c \ $(NULL) osmo_gbproxy_LDADD = \ + libcommon.la \ $(OSMO_LIBS) \ -lrt \ $(NULL) @@ -77,20 +93,17 @@ sgsn_vty.c \ sgsn_libgtp.c \ gprs_llc.c \ - gprs_llc_parse.c \ gprs_llc_vty.c \ - crc24.c \ sgsn_ctrl.c \ sgsn_auth.c \ gprs_subscriber.c \ - gprs_utils.c \ sgsn_cdr.c \ - sgsn_ares.c \ slhc.c \ gprs_llc_xid.c \ v42bis.c \ $(NULL) osmo_sgsn_LDADD = \ + libcommon.la \ $(OSMO_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOGSUPCLIENT_LIBS) \ @@ -113,10 +126,9 @@ gtphub_sock.c \ gtphub_ares.c \ gtphub_vty.c \ - sgsn_ares.c \ - gprs_utils.c \ $(NULL) osmo_gtphub_LDADD = \ + libcommon.la \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib7665c530c086a5f3135c395bb8bf19ed4a882b6 Gerrit-Change-Number: 15360 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at gnumonks.org> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-CC: fixeria <axilirator at gmail.com> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190906/9c0069ff/attachment.htm>