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/.
ahuemer gerrit-no-reply at lists.osmocom.orgReview at https://gerrit.osmocom.org/824 Build fixes and cleanups Some fixes for build environments where dependencies are installed in distinct directories. Change-Id: I9bd4f7a0b0bce0184f093ac61099c6681a458f65 --- M openbsc/src/gprs/Makefile.am M openbsc/src/libiu/Makefile.am M openbsc/tests/gtphub/Makefile.am M openbsc/tests/mm_auth/Makefile.am M openbsc/tests/sgsn/Makefile.am M openbsc/tests/xid/Makefile.am 6 files changed, 41 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/24/824/1 diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index 6a95315..280a029 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -8,7 +8,7 @@ endif OSMO_LIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOCTRL_LIBS) $(LIBOSMOGB_LIBS) + $(LIBOSMOCTRL_LIBS) $(LIBOSMOGB_LIBS) $(LIBOSMOABIS_LIBS) $(LIBGTP_LIBS) bin_PROGRAMS = osmo-gbproxy @@ -31,20 +31,17 @@ gprs_utils.c gprs_gsup_client.c \ sgsn_cdr.c sgsn_ares.c \ oap.c oap_messages.c gprs_llc_xid.c -osmo_sgsn_LDADD = \ - $(top_builddir)/src/libcommon/libcommon.a +osmo_sgsn_LDADD = $(top_builddir)/src/libcommon/libcommon.a \ + $(OSMO_LIBS) $(LIBCARES_LIBS) $(LIBCRYPTO_LIBS) -lrt + if BUILD_IU -osmo_sgsn_LDADD += $(top_builddir)/src/libiu/libiu.a -endif -osmo_sgsn_LDADD += -lgtp $(OSMO_LIBS) $(LIBOSMOABIS_LIBS) $(LIBCARES_LIBS) \ - $(LIBCRYPTO_LIBS) -lrt -if BUILD_IU -osmo_sgsn_LDADD += $(LIBOSMOSIGTRAN_LIBS) $(LIBOSMORANAP_LIBS) $(LIBASN1C_LIBS) +osmo_sgsn_LDADD += $(top_builddir)/src/libiu/libiu.a \ + $(LIBOSMOSIGTRAN_LIBS) $(LIBOSMORANAP_LIBS) $(LIBASN1C_LIBS) endif osmo_gtphub_SOURCES = gtphub_main.c gtphub.c gtphub_sock.c gtphub_ares.c \ gtphub_vty.c sgsn_ares.c gprs_utils.c -osmo_gtphub_LDADD = \ - $(top_builddir)/src/libcommon/libcommon.a \ - -lgtp $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ - $(LIBCARES_LIBS) -lrt + +osmo_gtphub_LDADD = $(top_builddir)/src/libcommon/libcommon.a \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ + $(LIBGTP_LIBS) $(LIBCARES_LIBS) -lrt diff --git a/openbsc/src/libiu/Makefile.am b/openbsc/src/libiu/Makefile.am index 1968d3e..9a6810e 100644 --- a/openbsc/src/libiu/Makefile.am +++ b/openbsc/src/libiu/Makefile.am @@ -1,8 +1,15 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS) \ - $(LIBASN1C_CFLAGS) \ - $(LIBOSMOSIGTRAN_CFLAGS) $(LIBOSMORANAP_CFLAGS) +AM_CFLAGS = -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBCRYPTO_CFLAGS) \ + $(LIBASN1C_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(LIBOSMORANAP_CFLAGS) \ + $(LIBGTP_CFLAGS) \ + $(COVERAGE_CFLAGS) noinst_LIBRARIES = libiu.a diff --git a/openbsc/tests/gtphub/Makefile.am b/openbsc/tests/gtphub/Makefile.am index dcb7211..8dfc56c 100644 --- a/openbsc/tests/gtphub/Makefile.am +++ b/openbsc/tests/gtphub/Makefile.am @@ -1,5 +1,8 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBGTP_CFLAGS) EXTRA_DIST = \ gtphub_test.ok @@ -20,5 +23,6 @@ $(top_builddir)/src/gprs/gtphub.o \ $(top_builddir)/src/gprs/gprs_utils.o \ $(LIBOSMOCORE_LIBS) \ - -lgtp -lrt + $(LIBGTP_LIBS) \ + -lrt diff --git a/openbsc/tests/mm_auth/Makefile.am b/openbsc/tests/mm_auth/Makefile.am index 516df00..5cac3f8 100644 --- a/openbsc/tests/mm_auth/Makefile.am +++ b/openbsc/tests/mm_auth/Makefile.am @@ -2,7 +2,8 @@ AM_CFLAGS=-Wall \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ - $(LIBCRYPTO_CFLAGS) + $(LIBCRYPTO_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) noinst_PROGRAMS = mm_auth_test diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am index ce64429..0e73d04 100644 --- a/openbsc/tests/sgsn/Makefile.am +++ b/openbsc/tests/sgsn/Makefile.am @@ -1,5 +1,11 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBCARES_CFLAGS) +AM_CFLAGS = \ + -Wall -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBCARES_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) + if BUILD_IU AM_CFLAGS += $(LIBASN1C_CFLAGS) $(LIBOSMOSIGTRAN_CFLAGS) $(LIBOSMORANAP_CFLAGS) endif @@ -41,7 +47,9 @@ $(LIBOSMOGB_LIBS) \ $(LIBCARES_LIBS) \ $(LIBCRYPTO_LIBS) \ - -lgtp -lrt + $(LIBGTP_LIBS) \ + -lrt + if BUILD_IU sgsn_test_LDADD += \ $(top_builddir)/src/libiu/libiu.a \ diff --git a/openbsc/tests/xid/Makefile.am b/openbsc/tests/xid/Makefile.am index 9b64965..08eae47 100644 --- a/openbsc/tests/xid/Makefile.am +++ b/openbsc/tests/xid/Makefile.am @@ -16,6 +16,7 @@ $(LIBOSMOGB_LIBS) \ $(LIBCARES_LIBS) \ $(LIBCRYPTO_LIBS) \ - -lgtp -lrt -lm + $(LIBGTP_LIBS) \ + -lrt -lm -- To view, visit https://gerrit.osmocom.org/824 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bd4f7a0b0bce0184f093ac61099c6681a458f65 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: ahuemer <alexander.huemer at xx.vu>