Move from local to external osmo* libraries

src/libdebug -> libosmocore
src/libselect -> libosmocore
src/libtimer -> libosmocore
src/libosmocc -> libosmo-cc
src/libg711 -> libosmo-cc

8 files changed, 29 insertions, 25 deletions

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index b6d8349..dd5b11a 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -17,9 +17,11 @@ test_filter_SOURCES = test_filter.c dummy.c
 
 test_filter_LDADD = \
 	$(COMMON_LA) \
-	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(top_builddir)/src/liboptions/liboptions.a \
+	$(top_builddir)/src/liblogging/liblogging.a \
+	$(LIBOSMOCC_LIBS) \
+	$(LIBOSMOCORE_LIBS) \
 	-lm
 
 test_sendevolumenregler_SOURCES = test_sendevolumenregler.c
@@ -40,10 +42,12 @@ test_emphasis_SOURCES = test_emphasis.c dummy.c
 
 test_emphasis_LDADD = \
 	$(COMMON_LA) \
-	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(top_builddir)/src/liboptions/liboptions.a \
+	$(top_builddir)/src/liblogging/liblogging.a \
+	$(LIBOSMOCC_LIBS) \
+	$(LIBOSMOCORE_LIBS) \
 	-lm
 
 test_dtmf_SOURCES = dummy.x test_dtmf.c
@@ -59,22 +63,20 @@ test_dms_SOURCES = test_dms.c dummy.c
 
 test_dms_LDADD = \
 	$(COMMON_LA) \
-	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
-	$(top_builddir)/src/libosmocc/libosmocc.a \
 	$(top_builddir)/src/liboptions/liboptions.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/nmt/libdmssms.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
-	$(top_builddir)/src/libtimer/libtimer.a \
-	$(top_builddir)/src/libselect/libselect.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libsample/libsample.a \
-	$(top_builddir)/src/libg711/libg711.a \
 	$(top_builddir)/src/libaaimage/libaaimage.a \
+	$(top_builddir)/src/liblogging/liblogging.a \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCC_LIBS) \
 	-lm
 
 if HAVE_ALSA
@@ -97,22 +99,20 @@ test_sms_SOURCES = dummy.c test_sms.c
 
 test_sms_LDADD = \
 	$(COMMON_LA) \
-	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
-	$(top_builddir)/src/libosmocc/libosmocc.a \
 	$(top_builddir)/src/liboptions/liboptions.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/nmt/libdmssms.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
-	$(top_builddir)/src/libtimer/libtimer.a \
-	$(top_builddir)/src/libselect/libselect.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(top_builddir)/src/libwave/libwave.a \
 	$(top_builddir)/src/libsample/libsample.a \
-	$(top_builddir)/src/libg711/libg711.a \
 	$(top_builddir)/src/libaaimage/libaaimage.a \
+	$(top_builddir)/src/liblogging/liblogging.a \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOCC_LIBS) \
 	-lm
 
 if HAVE_ALSA
@@ -157,8 +157,10 @@ test_goertzel_SOURCES = test_goertzel.c dummy.c
 
 test_goertzel_LDADD = \
 	$(COMMON_LA) \
-	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libgoertzel/libgoertzel.a \
 	$(top_builddir)/src/liboptions/liboptions.a \
+	$(top_builddir)/src/liblogging/liblogging.a \
+	$(LIBOSMOCC_LIBS) \
+	$(LIBOSMOCORE_LIBS) \
 	-lm
 
diff --git a/src/test/test_dms.c b/src/test/test_dms.c
index 23a91db..f73f735 100644
--- a/src/test/test_dms.c
+++ b/src/test/test_dms.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "../libsample/sample.h"
-#include "../libdebug/debug.h"
+#include "../liblogging/logging.h"
 #include "../nmt/nmt.h"
 
 extern int dms_allow_loopback;
@@ -80,9 +80,10 @@ int main(void)
 	int i, j;
 
 	/* this is never called, it forces the linker to add mobile functions */
-	if (debuglevel == -1000) main_mobile_loop();
+	if (loglevel == -1000) main_mobile_loop();
 
-	debuglevel = DEBUG_DEBUG;
+	loglevel = LOGL_DEBUG;
+	logging_init();
 	dms_allow_loopback = 1;
 
 	nmt = alloc_nmt();
@@ -199,7 +200,7 @@ int main(void)
 
 	ok();
 
-	debuglevel = DEBUG_INFO;
+	loglevel = LOGL_INFO;
 
 	/* test again with pseudo random packet dropps */
 	srandom(0);
diff --git a/src/test/test_dtmf.c b/src/test/test_dtmf.c
index f26ae3b..6cf8ebe 100644
--- a/src/test/test_dtmf.c
+++ b/src/test/test_dtmf.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <math.h>
 #include <string.h>
-#include "../libdebug/debug.h"
+#include "../liblogging/logging.h"
 #include "../libsample/sample.h"
 #include "../libdtmf/dtmf_decode.h"
 #include "../libdtmf/dtmf_encode.h"
diff --git a/src/test/test_emphasis.c b/src/test/test_emphasis.c
index aea6356..ab78ee9 100644
--- a/src/test/test_emphasis.c
+++ b/src/test/test_emphasis.c
@@ -5,7 +5,7 @@
 #include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../libemphasis/emphasis.h"
-#include "../libdebug/debug.h"
+#include "../liblogging/logging.h"
 
 #define level2db(level)		(20 * log10(level))
 #define db2level(db)		pow(10, (double)db / 20.0)
diff --git a/src/test/test_filter.c b/src/test/test_filter.c
index ceaa463..f1fe5cc 100644
--- a/src/test/test_filter.c
+++ b/src/test/test_filter.c
@@ -5,7 +5,7 @@
 #include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../libfilter/fir_filter.h"
-#include "../libdebug/debug.h"
+#include "../liblogging/logging.h"
 
 #define level2db(level)		(20 * log10(level))
 #define db2level(db)		pow(10, (double)db / 20.0)
diff --git a/src/test/test_goertzel.c b/src/test/test_goertzel.c
index ee1ba0f..656f31e 100644
--- a/src/test/test_goertzel.c
+++ b/src/test/test_goertzel.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include "../libsample/sample.h"
 #include "../libgoertzel/goertzel.h"
-#include "../libdebug/debug.h"
+#include "../liblogging/logging.h"
 
 #define level2db(level)		(20 * log10(level))
 #define db2level(db)		pow(10, (double)db / 20.0)
diff --git a/src/test/test_performance.c b/src/test/test_performance.c
index a045eee..ae10930 100644
--- a/src/test/test_performance.c
+++ b/src/test/test_performance.c
@@ -6,7 +6,7 @@
 #include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../libfm/fm.h"
-#include "../libdebug/debug.h"
+#include "../liblogging/logging.h"
 
 struct timeval start_tv, tv;
 double duration;
diff --git a/src/test/test_sms.c b/src/test/test_sms.c
index 36c892b..2ffe805 100644
--- a/src/test/test_sms.c
+++ b/src/test/test_sms.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "../libsample/sample.h"
-#include "../libdebug/debug.h"
+#include "../liblogging/logging.h"
 #include "../nmt/nmt.h"
 
 static const uint8_t test_mo_sms_data1[] = {
@@ -107,9 +107,10 @@ int main(void)
 	int rc;
 
 	/* this is never called, it forces the linker to add mobile functions */
-	if (debuglevel == -1000) main_mobile_loop();
+	if (loglevel == -1000) main_mobile_loop();
 
-	debuglevel = DEBUG_DEBUG;
+	loglevel = LOGL_DEBUG;
+	logging_init();
 
 	nmt = calloc(sizeof(*nmt), 1);
 	sms_init_sender(nmt);