diff options
-rw-r--r-- | openbsc/src/gprs/Makefile.am | 15 | ||||
-rw-r--r-- | openbsc/src/libcommon/Makefile.am | 17 | ||||
-rw-r--r-- | openbsc/src/libcommon/gsup_client.c (renamed from openbsc/src/gprs/gprs_gsup_client.c) | 0 | ||||
-rw-r--r-- | openbsc/src/libcommon/gsup_test_client.c (renamed from openbsc/src/gprs/gsup_test_client.c) | 0 | ||||
-rw-r--r-- | openbsc/tests/sgsn/Makefile.am | 1 |
5 files changed, 17 insertions, 16 deletions
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index d059aeed0..cff17dde5 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -37,7 +37,6 @@ OSMO_LIBS = \ $(NULL) bin_PROGRAMS = \ - gsup_test_client \ osmo-gbproxy \ $(NULL) if HAVE_LIBGTP @@ -88,7 +87,6 @@ osmo_sgsn_SOURCES = \ sgsn_auth.c \ gprs_subscriber.c \ gprs_utils.c \ - gprs_gsup_client.c \ sgsn_cdr.c \ sgsn_ares.c \ slhc.c \ @@ -132,16 +130,3 @@ osmo_gtphub_LDADD = \ $(LIBGTP_LIBS) \ -lrt \ $(NULL) - -gsup_test_client_SOURCES = \ - gprs_gsup_client.c \ - gsup_test_client.c \ - $(NULL) -gsup_test_client_LDADD = \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - -lrt \ - $(NULL) diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am index 6582d1ea3..0b258c08a 100644 --- a/openbsc/src/libcommon/Makefile.am +++ b/openbsc/src/libcommon/Makefile.am @@ -23,8 +23,25 @@ libcommon_a_SOURCES = \ debug.c \ gsm_data.c \ gsm_data_shared.c \ + gsup_client.c \ oap_client.c \ socket.c \ talloc_ctx.c \ gsm_subscriber_base.c \ $(NULL) + +noinst_PROGRAMS = \ + gsup_test_client \ + $(NULL) + +gsup_test_client_SOURCES = \ + gsup_test_client.c \ + $(NULL) +gsup_test_client_LDADD = \ + libcommon.a \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + -lrt \ + $(NULL) diff --git a/openbsc/src/gprs/gprs_gsup_client.c b/openbsc/src/libcommon/gsup_client.c index 0360e0a24..0360e0a24 100644 --- a/openbsc/src/gprs/gprs_gsup_client.c +++ b/openbsc/src/libcommon/gsup_client.c diff --git a/openbsc/src/gprs/gsup_test_client.c b/openbsc/src/libcommon/gsup_test_client.c index 1889c6fde..1889c6fde 100644 --- a/openbsc/src/gprs/gsup_test_client.c +++ b/openbsc/src/libcommon/gsup_test_client.c diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am index 00b80f637..f1606cb96 100644 --- a/openbsc/tests/sgsn/Makefile.am +++ b/openbsc/tests/sgsn/Makefile.am @@ -50,7 +50,6 @@ sgsn_test_LDADD = \ $(top_builddir)/src/gprs/sgsn_libgtp.o \ $(top_builddir)/src/gprs/sgsn_auth.o \ $(top_builddir)/src/gprs/sgsn_ares.o \ - $(top_builddir)/src/gprs/gprs_gsup_client.o \ $(top_builddir)/src/gprs/gprs_utils.o \ $(top_builddir)/src/gprs/gprs_subscriber.o \ $(top_builddir)/src/gprs/gprs_gb_parse.o \ |