Restructure: Move debug from common code to 'libdebug'

.gitignore

@@ -20,6 +20,7 @@ compile
 .libs
 .dirstamp
 m4
+src/libdebug/libdebug.a
 src/libmobile/libmobile.a
 src/libdisplay/libdisplay.a
 src/libimage/libimage.a
@@ -42,7 +43,6 @@ src/libmncc/libmncc.a
 src/libsound/libsound.a
 src/libsdr/libsdr.a
 src/libsample/libsample.a
-src/common/libcommon.a
 src/anetz/libgermanton.a
 src/anetz/anetz
 src/bnetz/bnetz

configure.ac

@@ -75,6 +75,7 @@ AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR su
 AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
 
 AC_OUTPUT(
+    src/libdebug/Makefile
     src/libmobile/Makefile
     src/libdisplay/Makefile
     src/libimage/Makefile
@@ -97,7 +98,6 @@ AC_OUTPUT(
     src/libsound/Makefile
     src/libsdr/Makefile
     src/libsample/Makefile
-    src/common/Makefile
     src/anetz/Makefile
     src/bnetz/Makefile
     src/cnetz/Makefile

src/Makefile.am

@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = \
+	libdebug \
 	libmobile \
 	libdisplay \
 	libsample \
@@ -29,7 +30,6 @@ SUBDIRS += \
 endif
 
 SUBDIRS += \
-	common \
 	anetz \
 	bnetz \
 	cnetz \

src/amps/Makefile.am

@@ -26,12 +26,12 @@ amps_SOURCES = \
 amps_LDADD = \
 	$(COMMON_LA) \
 	libamps.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/libcompandor/libcompandor.a \
 	$(top_builddir)/src/libgoertzel/libgoertzel.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \

src/amps/amps.c

@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "../libmncc/cause.h"
 #include "amps.h"

src/amps/amps_tacs_main.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include "../libsample/sample.h"
 #include "../libmobile/main_mobile.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "amps.h"
 #include "dsp.h"

src/amps/dsp.c

@@ -82,7 +82,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "amps.h"
 #include "frame.h"

src/amps/frame.c

@@ -27,7 +27,7 @@
 #include <math.h>
 #include <inttypes.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "amps.h"
 #include "dsp.h"
 #include "frame.h"

src/amps/transaction.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "../libmncc/cause.h"
 #include "amps.h"

src/anetz/Makefile.am

@@ -18,12 +18,12 @@ anetz_SOURCES = \
 anetz_LDADD = \
 	$(COMMON_LA) \
 	libgermanton.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/libgoertzel/libgoertzel.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libsquelch/libsquelch.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \

src/anetz/anetz.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libtimer/timer.h"
 #include "../libmobile/call.h"
 #include "../libmncc/cause.h"

src/anetz/dsp.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libtimer/timer.h"
 #include "../libmobile/call.h"
 #include "anetz.h"

src/anetz/main.c

@@ -25,7 +25,7 @@
 #include <math.h>
 #include "../libsample/sample.h"
 #include "../libmobile/main_mobile.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libtimer/timer.h"
 #include "../libmobile/call.h"
 #include "freiton.h"

src/bnetz/Makefile.am

@@ -14,11 +14,11 @@ bnetz_SOURCES = \
 bnetz_LDADD = \
 	$(COMMON_LA) \
 	../anetz/libgermanton.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libsquelch/libsquelch.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \

src/bnetz/bnetz.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "../libmncc/cause.h"
 #include "bnetz.h"

src/bnetz/dsp.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "bnetz.h"
 #include "dsp.h"

src/bnetz/main.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "../libmobile/main_mobile.h"
 #include "../anetz/freiton.h"

src/cnetz/Makefile.am

@@ -17,11 +17,11 @@ cnetz_SOURCES = \
 cnetz_LDADD = \
 	$(COMMON_LA) \
 	../anetz/libgermanton.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/libcompandor/libcompandor.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libscrambler/libscrambler.a \

src/cnetz/cnetz.c

@@ -143,7 +143,7 @@
 #include <math.h>
 #include <inttypes.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "../libmncc/cause.h"
 #include "cnetz.h"

src/cnetz/database.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "cnetz.h"
 #include "database.h"
 

src/cnetz/dsp.c

@@ -26,7 +26,7 @@
 #include <math.h>
 #include <errno.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "cnetz.h"
 #include "sysinfo.h"

src/cnetz/fsk_demod.c

@@ -129,7 +129,7 @@
 #include <string.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "cnetz.h"
 #include "dsp.h"
 #include "telegramm.h"

src/cnetz/main.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include "../libsample/sample.h"
 #include "../libmobile/main_mobile.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "../anetz/freiton.h"
 #include "../anetz/besetztton.h"

src/cnetz/telegramm.c

@@ -27,7 +27,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "cnetz.h"
 #include "dsp.h"
 #include "sysinfo.h"

src/cnetz/transaction.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "../libmncc/cause.h"
 #include "cnetz.h"

src/common/Makefile.am

@@ -1,7 +0,0 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
-
-noinst_LIBRARIES = libcommon.a
-
-libcommon_a_SOURCES = \
-	debug.c
-

src/jtacs/Makefile.am

@@ -12,12 +12,12 @@ jtacs_SOURCES = \
 jtacs_LDADD = \
 	$(COMMON_LA) \
 	../amps/libamps.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/libcompandor/libcompandor.a \
 	$(top_builddir)/src/libgoertzel/libgoertzel.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \

src/libdebug/Makefile.am

@@ -0,0 +1,11 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libdebug.a
+
+libdebug_a_SOURCES = \
+	debug.c
+
+if HAVE_SDR
+AM_CPPFLAGS += -DHAVE_SDR
+endif
+

src/libemphasis/emphasis.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libfilter/iir_filter.h"
 #include "emphasis.h"
 

src/libfsk/fsk.c

@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "fsk.h"
 
 #define PI			M_PI

src/libgoertzel/goertzel.c

@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "goertzel.h"
 
 /*

src/libjitter/jitter.c

@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "jitter.h"
 
 /* create jitter buffer */

src/libmncc/mncc_console.c

@@ -27,7 +27,7 @@
 #include "../libsample/sample.h"
 #include "../libsamplerate/samplerate.h"
 #include "../libjitter/jitter.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "testton.h"
 #include "mncc.h"
 #include "mncc_console.h"

src/libmncc/mncc_cross.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "cause.h"
 #include "mncc.h"

src/libmncc/mncc_sock.c

@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <unistd.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/call.h"
 #include "cause.h"
 #include "mncc_sock.h"

src/libmobile/call.c

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "sender.h"
 #include "call.h"
 #include "../libtimer/timer.h"

src/libmobile/main_mobile.c

@@ -31,7 +31,7 @@
 #include <getopt.h>
 #include "../libsample/sample.h"
 #include "main_mobile.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "sender.h"
 #include "../libtimer/timer.h"
 #include "call.h"

src/libmobile/sender.c

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <string.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "sender.h"
 #include "../libtimer/timer.h"
 

src/libsdr/sdr.c

@@ -41,7 +41,7 @@ enum paging_signal;
 #ifdef HAVE_SOAPY
 #include "soapy.h"
 #endif
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 
 /* enable to debug buffer handling */
 //#define DEBUG_BUFFER

src/libsdr/soapy.c

@@ -26,7 +26,7 @@
 #include <SoapySDR/Device.h>
 #include <SoapySDR/Formats.h>
 #include "soapy.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 
 extern int sdr_rx_overflow;
 

src/libsdr/uhd.c

@@ -25,7 +25,7 @@
 #include <uhd.h>
 #include <uhd/usrp/usrp.h>
 #include "uhd.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 
 /* use to TX time stamp */
 //#define TX_TIMESTAMP

src/libsound/sound_alsa.c

@@ -22,7 +22,7 @@
 #include <math.h>
 #include <alsa/asoundlib.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmobile/sender.h"
 
 typedef struct sound {

src/libsquelch/squelch.c

@@ -19,7 +19,7 @@
 
 #include <string.h>
 #include <math.h>
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "squelch.h"
 
 #define CHAN squelch->chan

src/nmt/Makefile.am

@@ -22,6 +22,7 @@ nmt_SOURCES = \
 nmt_LDADD = \
 	$(COMMON_LA) \
 	libdmssms.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/libcompandor/libcompandor.a \
@@ -29,7 +30,6 @@ nmt_LDADD = \
 	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
 	$(top_builddir)/src/libdtmf/libdtmf.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \

src/nmt/dms.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "nmt.h"
 
 #define MUTE_DURATION		0.300	/* 200ms, and about 95ms for the frame itself */

src/nmt/dsp.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "nmt.h"
 #include "transaction.h"
 #include "dsp.h"

src/nmt/frame.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libhagelbarger/hagelbarger.h"
 #include "nmt.h"
 #include "frame.h"

src/nmt/main.c

@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include "../libsample/sample.h"
 #include "../libmobile/main_mobile.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "nmt.h"
 #include "frame.h"
 #include "dsp.h"

src/nmt/nmt.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <time.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmncc/cause.h"
 #include "nmt.h"
 #include "transaction.h"

src/nmt/sms.c

@@ -24,7 +24,7 @@
 #include <time.h>
 #include <errno.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "nmt.h"
 
 #define SMS_RECEIVE_TO		5.0

src/nmt/transaction.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "nmt.h"
 #include "transaction.h"
 

src/r2000/Makefile.am

@@ -12,12 +12,12 @@ radiocom2000_SOURCES = \
 	main.c
 radiocom2000_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/libcompandor/libcompandor.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \

src/r2000/dsp.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <math.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "r2000.h"
 #include "dsp.h"
 

src/r2000/frame.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libhagelbarger/hagelbarger.h"
 #include "frame.h"
 

src/r2000/main.c

@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include "../libsample/sample.h"
 #include "../libmobile/main_mobile.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "r2000.h"
 #include "dsp.h"
 #include "frame.h"

src/r2000/r2000.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <time.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../libmncc/cause.h"
 #include "r2000.h"
 //#include "transaction.h"

src/tacs/Makefile.am

@@ -13,12 +13,12 @@ tacs_SOURCES = \
 tacs_LDADD = \
 	$(COMMON_LA) \
 	../amps/libamps.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
 	$(top_builddir)/src/libcompandor/libcompandor.a \
 	$(top_builddir)/src/libgoertzel/libgoertzel.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libemphasis/libemphasis.a \

src/test/Makefile.am

@@ -13,9 +13,9 @@ test_filter_SOURCES = test_filter.c dummy.c
 
 test_filter_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
@@ -41,9 +41,9 @@ test_compandor_SOURCES = dummy.x test_compandor.c
 
 test_compandor_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libcompandor/libcompandor.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \
@@ -53,9 +53,9 @@ test_emphasis_SOURCES = test_emphasis.c dummy.c
 
 test_emphasis_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libdisplay/libdisplay.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
@@ -81,10 +81,10 @@ 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/libdisplay/libdisplay.a \
 	$(top_builddir)/src/nmt/libdmssms.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
@@ -110,10 +110,10 @@ 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/libdisplay/libdisplay.a \
 	$(top_builddir)/src/nmt/libdmssms.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
@@ -139,8 +139,8 @@ test_performance_SOURCES = dummy.c test_performance.c
 
 test_performance_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libfm/libfm.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(ALSA_LIBS) \
@@ -152,9 +152,9 @@ test_hagelbarger_SOURCES = dummy.c test_hagelbarger.c
 
 test_hagelbarger_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libmobile/libmobile.a \
 	$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(ALSA_LIBS) \
 	$(UHD_LIBS) \
 	$(SOAPY_LIBS) \

src/test/test_dms.c

@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../nmt/nmt.h"
 
 extern int dms_allow_loopback;

src/test/test_emphasis.c

@@ -5,7 +5,7 @@
 #include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../libemphasis/emphasis.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 
 #define level2db(level)		(20 * log10(level))
 #define db2level(db)		pow(10, (double)db / 20.0)

src/test/test_filter.c

@@ -4,7 +4,7 @@
 #include <string.h>
 #include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 
 #define level2db(level)		(20 * log10(level))
 #define db2level(db)		pow(10, (double)db / 20.0)

src/test/test_performance.c

@@ -6,7 +6,7 @@
 #include "../libsample/sample.h"
 #include "../libfilter/iir_filter.h"
 #include "../libfm/fm.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 
 struct timeval start_tv, tv;
 double duration;

src/test/test_sms.c

@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "../libsample/sample.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #include "../nmt/nmt.h"
 
 static const uint8_t test_mo_sms_data1[] = {

src/tv/Makefile.am

@@ -14,8 +14,8 @@ osmotv_SOURCES = \
 	main.c
 osmotv_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/libimage/libimage.a \
-	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libfm/libfm.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(top_builddir)/src/libwave/libwave.a \

src/tv/main.c

@@ -32,7 +32,7 @@ enum paging_signal;
 #include "../libfm/fm.h"
 #include "../libwave/wave.h"
 #include "../libimage/img.h"
-#include "../common/debug.h"
+#include "../libdebug/debug.h"
 #ifdef HAVE_SDR
 #include "../libsdr/sdr_config.h"
 #include "../libsdr/sdr.h"