Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/6436

to look at the new patch set (#4).

drop libcommon completely

Change-Id: Ifa3486f04cdd5fda1e92630dfc1a5f670773bc14
---
M configure.ac
M src/Makefile.am
M src/ipaccess/Makefile.am
D src/libcommon/Makefile.am
M src/osmo-bsc/Makefile.am
M src/osmo-bsc_nat/Makefile.am
M src/utils/Makefile.am
M tests/abis/Makefile.am
M tests/bsc-nat-trie/Makefile.am
M tests/bsc-nat/Makefile.am
M tests/bsc/Makefile.am
M tests/bssap/Makefile.am
M tests/channel/Makefile.am
M tests/gsm0408/Makefile.am
M tests/nanobts_omlattr/Makefile.am
M tests/subscr/Makefile.am
16 files changed, 1 insertion(+), 41 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/6436/4

diff --git a/configure.ac b/configure.ac
index d756970..b2644fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,6 @@
     include/osmocom/bsc/Makefile
     src/Makefile
     src/libbsc/Makefile
-    src/libcommon/Makefile
     src/libfilter/Makefile
     src/libcommon-cs/Makefile
     src/osmo-bsc/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 637272d..28b070e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,6 @@
 
 # Libraries
 SUBDIRS = \
-       libcommon \
        libcommon-cs \
        libbsc \
        libfilter \
diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index b3b2b8c..0301d3a 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -30,7 +30,6 @@
 
 abisip_find_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(OSMO_LIBS) \
        $(NULL)
 
@@ -48,7 +47,6 @@
 ipaccess_config_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(OSMO_LIBS) \
        $(NULL)
 
@@ -58,6 +56,5 @@
 
 ipaccess_proxy_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(OSMO_LIBS) \
        $(NULL)
diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am
deleted file mode 100644
index 6d39cb5..0000000
--- a/src/libcommon/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-AM_CPPFLAGS = \
-       $(all_includes) \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir) \
-       $(NULL)
-
-AM_CFLAGS = \
-       -Wall \
-       $(LIBOSMOCORE_CFLAGS) \
-       $(LIBOSMOGSM_CFLAGS) \
-       $(LIBOSMOVTY_CFLAGS) \
-       $(LIBOSMOABIS_CFLAGS) \
-       $(LIBOSMOSIGTRAN_CFLAGS) \
-       $(LIBOSMOLEGACYMGCP_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
-       $(NULL)
-
-noinst_LIBRARIES = \
-       libcommon.a \
-       $(NULL)
-
-libcommon_a_SOURCES = \
-       $(NULL)
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index 7978852..50f9c78 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -43,7 +43,6 @@
        $(top_builddir)/src/libfilter/libfilter.a \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOVTY_LIBS) \
diff --git a/src/osmo-bsc_nat/Makefile.am b/src/osmo-bsc_nat/Makefile.am
index a941b58..83ef850 100644
--- a/src/osmo-bsc_nat/Makefile.am
+++ b/src/osmo-bsc_nat/Makefile.am
@@ -41,7 +41,6 @@
        $(top_builddir)/src/libfilter/libfilter.a \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(LIBOSMOSCCP_LIBS) \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 78d4965..354f2b2 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -49,7 +49,6 @@
 bs11_config_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOABIS_LIBS) \
@@ -115,7 +114,7 @@
        $(NULL)
 
 meas_json_LDADD = \
-       $(top_builddir)/src/libcommon/libcommon.a \
+       $(top_builddir)/src/libbsc/libbsc.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(NULL)
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 137321c..1e982af 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -26,7 +26,6 @@
 
 abis_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/bsc-nat-trie/Makefile.am b/tests/bsc-nat-trie/Makefile.am
index d20bd0a..4afa1a4 100644
--- a/tests/bsc-nat-trie/Makefile.am
+++ b/tests/bsc-nat-trie/Makefile.am
@@ -11,7 +11,6 @@
 bsc_nat_trie_test_SOURCES = bsc_nat_trie_test.c \
                        $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c
 bsc_nat_trie_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
-                       $(top_builddir)/src/libcommon/libcommon.a \
                        $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lrt \
                        $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
                        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/bsc-nat/Makefile.am b/tests/bsc-nat/Makefile.am
index 7f6730e..4231cb4 100644
--- a/tests/bsc-nat/Makefile.am
+++ b/tests/bsc-nat/Makefile.am
@@ -46,7 +46,6 @@
        $(top_builddir)/src/libfilter/libfilter.a \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOSCCP_LIBS) \
diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am
index 9d95ead..70a788e 100644
--- a/tests/bsc/Makefile.am
+++ b/tests/bsc/Makefile.am
@@ -34,7 +34,6 @@
 bsc_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOVTY_LIBS) \
diff --git a/tests/bssap/Makefile.am b/tests/bssap/Makefile.am
index 77309c9..697a215 100644
--- a/tests/bssap/Makefile.am
+++ b/tests/bssap/Makefile.am
@@ -34,7 +34,6 @@
 
 bssap_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
diff --git a/tests/channel/Makefile.am b/tests/channel/Makefile.am
index aae7a45..a3c3159 100644
--- a/tests/channel/Makefile.am
+++ b/tests/channel/Makefile.am
@@ -26,7 +26,6 @@
 channel_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am
index c5ae061..eeb0d3c 100644
--- a/tests/gsm0408/Makefile.am
+++ b/tests/gsm0408/Makefile.am
@@ -25,7 +25,6 @@
 gsm0408_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/nanobts_omlattr/Makefile.am 
b/tests/nanobts_omlattr/Makefile.am
index 336ccaf..2d77542 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -24,7 +24,6 @@
 
 nanobts_omlattr_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
diff --git a/tests/subscr/Makefile.am b/tests/subscr/Makefile.am
index b743063..3c00043 100644
--- a/tests/subscr/Makefile.am
+++ b/tests/subscr/Makefile.am
@@ -33,7 +33,6 @@
 bsc_subscr_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
        $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-       $(top_builddir)/src/libcommon/libcommon.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOABIS_LIBS) \
        $(LIBOSMOGSM_LIBS) \

-- 
To view, visit https://gerrit.osmocom.org/6436
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ifa3486f04cdd5fda1e92630dfc1a5f670773bc14
Gerrit-PatchSet: 4
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder

Reply via email to