From 1a341f6b4e1cc062b9cedc738a6e2205c0fa651e Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sat, 18 Nov 2017 08:58:57 +0100 Subject: [PATCH] Restructure: Move debug from common code to 'libdebug' --- .gitignore | 2 +- configure.ac | 2 +- src/Makefile.am | 2 +- src/amps/Makefile.am | 2 +- src/amps/amps.c | 2 +- src/amps/amps_tacs_main.c | 2 +- src/amps/dsp.c | 2 +- src/amps/frame.c | 2 +- src/amps/transaction.c | 2 +- src/anetz/Makefile.am | 2 +- src/anetz/anetz.c | 2 +- src/anetz/dsp.c | 2 +- src/anetz/main.c | 2 +- src/bnetz/Makefile.am | 2 +- src/bnetz/bnetz.c | 2 +- src/bnetz/dsp.c | 2 +- src/bnetz/main.c | 2 +- src/cnetz/Makefile.am | 2 +- src/cnetz/cnetz.c | 2 +- src/cnetz/database.c | 2 +- src/cnetz/dsp.c | 2 +- src/cnetz/fsk_demod.c | 2 +- src/cnetz/main.c | 2 +- src/cnetz/telegramm.c | 2 +- src/cnetz/transaction.c | 2 +- src/common/Makefile.am | 7 ------- src/jtacs/Makefile.am | 2 +- src/libdebug/Makefile.am | 11 +++++++++++ src/{common => libdebug}/debug.c | 0 src/{common => libdebug}/debug.h | 0 src/libemphasis/emphasis.c | 2 +- src/libfsk/fsk.c | 2 +- src/libgoertzel/goertzel.c | 2 +- src/libjitter/jitter.c | 2 +- src/libmncc/mncc_console.c | 2 +- src/libmncc/mncc_cross.c | 2 +- src/libmncc/mncc_sock.c | 2 +- src/libmobile/call.c | 2 +- src/libmobile/main_mobile.c | 2 +- src/libmobile/sender.c | 2 +- src/libsdr/sdr.c | 2 +- src/libsdr/soapy.c | 2 +- src/libsdr/uhd.c | 2 +- src/libsound/sound_alsa.c | 2 +- src/libsquelch/squelch.c | 2 +- src/nmt/Makefile.am | 2 +- src/nmt/dms.c | 2 +- src/nmt/dsp.c | 2 +- src/nmt/frame.c | 2 +- src/nmt/main.c | 2 +- src/nmt/nmt.c | 2 +- src/nmt/sms.c | 2 +- src/nmt/transaction.c | 2 +- src/r2000/Makefile.am | 2 +- src/r2000/dsp.c | 2 +- src/r2000/frame.c | 2 +- src/r2000/main.c | 2 +- src/r2000/r2000.c | 2 +- src/tacs/Makefile.am | 2 +- src/test/Makefile.am | 14 +++++++------- src/test/test_dms.c | 2 +- src/test/test_emphasis.c | 2 +- src/test/test_filter.c | 2 +- src/test/test_performance.c | 2 +- src/test/test_sms.c | 2 +- src/tv/Makefile.am | 2 +- src/tv/main.c | 2 +- 67 files changed, 80 insertions(+), 76 deletions(-) delete mode 100644 src/common/Makefile.am create mode 100644 src/libdebug/Makefile.am rename src/{common => libdebug}/debug.c (100%) rename src/{common => libdebug}/debug.h (100%) diff --git a/.gitignore b/.gitignore index 15b36a9..75bf814 100644 --- a/.gitignore +++ b/.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 diff --git a/configure.ac b/configure.ac index 95024e6..51ca055 100644 --- a/configure.ac +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index 698c3f5..4aae1df 100644 --- a/src/Makefile.am +++ b/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 \ diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am index 8f29c9e..b9d03f7 100644 --- a/src/amps/Makefile.am +++ b/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 \ diff --git a/src/amps/amps.c b/src/amps/amps.c index 63ac076..d2dd948 100644 --- a/src/amps/amps.c +++ b/src/amps/amps.c @@ -43,7 +43,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "../libmncc/cause.h" #include "amps.h" diff --git a/src/amps/amps_tacs_main.c b/src/amps/amps_tacs_main.c index 28f7d0c..9601b10 100644 --- a/src/amps/amps_tacs_main.c +++ b/src/amps/amps_tacs_main.c @@ -24,7 +24,7 @@ #include #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" diff --git a/src/amps/dsp.c b/src/amps/dsp.c index 8873026..1847f8d 100644 --- a/src/amps/dsp.c +++ b/src/amps/dsp.c @@ -82,7 +82,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "amps.h" #include "frame.h" diff --git a/src/amps/frame.c b/src/amps/frame.c index 52ee863..b70830c 100644 --- a/src/amps/frame.c +++ b/src/amps/frame.c @@ -27,7 +27,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "amps.h" #include "dsp.h" #include "frame.h" diff --git a/src/amps/transaction.c b/src/amps/transaction.c index 7e1ff2c..27766c5 100644 --- a/src/amps/transaction.c +++ b/src/amps/transaction.c @@ -21,7 +21,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "../libmncc/cause.h" #include "amps.h" diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am index c28b29f..0a33082 100644 --- a/src/anetz/Makefile.am +++ b/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 \ diff --git a/src/anetz/anetz.c b/src/anetz/anetz.c index 899cc80..e33aa79 100644 --- a/src/anetz/anetz.c +++ b/src/anetz/anetz.c @@ -25,7 +25,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libtimer/timer.h" #include "../libmobile/call.h" #include "../libmncc/cause.h" diff --git a/src/anetz/dsp.c b/src/anetz/dsp.c index fed1613..828f551 100644 --- a/src/anetz/dsp.c +++ b/src/anetz/dsp.c @@ -26,7 +26,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libtimer/timer.h" #include "../libmobile/call.h" #include "anetz.h" diff --git a/src/anetz/main.c b/src/anetz/main.c index 825c4e9..617bd88 100644 --- a/src/anetz/main.c +++ b/src/anetz/main.c @@ -25,7 +25,7 @@ #include #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" diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am index 329607b..0e45a0a 100644 --- a/src/bnetz/Makefile.am +++ b/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 \ diff --git a/src/bnetz/bnetz.c b/src/bnetz/bnetz.c index 21ef024..3367e7d 100644 --- a/src/bnetz/bnetz.c +++ b/src/bnetz/bnetz.c @@ -25,7 +25,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "../libmncc/cause.h" #include "bnetz.h" diff --git a/src/bnetz/dsp.c b/src/bnetz/dsp.c index b3d1599..093cb1a 100644 --- a/src/bnetz/dsp.c +++ b/src/bnetz/dsp.c @@ -26,7 +26,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "bnetz.h" #include "dsp.h" diff --git a/src/bnetz/main.c b/src/bnetz/main.c index 68d1359..d287e14 100644 --- a/src/bnetz/main.c +++ b/src/bnetz/main.c @@ -24,7 +24,7 @@ #include #include #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" diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am index 3aa530c..da085e3 100644 --- a/src/cnetz/Makefile.am +++ b/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 \ diff --git a/src/cnetz/cnetz.c b/src/cnetz/cnetz.c index c34397d..575fcf0 100644 --- a/src/cnetz/cnetz.c +++ b/src/cnetz/cnetz.c @@ -143,7 +143,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "../libmncc/cause.h" #include "cnetz.h" diff --git a/src/cnetz/database.c b/src/cnetz/database.c index b7465e9..a8b2887 100644 --- a/src/cnetz/database.c +++ b/src/cnetz/database.c @@ -22,7 +22,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "cnetz.h" #include "database.h" diff --git a/src/cnetz/dsp.c b/src/cnetz/dsp.c index 30d7372..4c2a05d 100644 --- a/src/cnetz/dsp.c +++ b/src/cnetz/dsp.c @@ -26,7 +26,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "cnetz.h" #include "sysinfo.h" diff --git a/src/cnetz/fsk_demod.c b/src/cnetz/fsk_demod.c index 2f0ae96..a2b85ba 100644 --- a/src/cnetz/fsk_demod.c +++ b/src/cnetz/fsk_demod.c @@ -129,7 +129,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "cnetz.h" #include "dsp.h" #include "telegramm.h" diff --git a/src/cnetz/main.c b/src/cnetz/main.c index d1b9a38..8d31cd5 100644 --- a/src/cnetz/main.c +++ b/src/cnetz/main.c @@ -24,7 +24,7 @@ #include #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" diff --git a/src/cnetz/telegramm.c b/src/cnetz/telegramm.c index 5e67622..eddaa01 100644 --- a/src/cnetz/telegramm.c +++ b/src/cnetz/telegramm.c @@ -27,7 +27,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "cnetz.h" #include "dsp.h" #include "sysinfo.h" diff --git a/src/cnetz/transaction.c b/src/cnetz/transaction.c index b26b642..29e5df4 100644 --- a/src/cnetz/transaction.c +++ b/src/cnetz/transaction.c @@ -21,7 +21,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "../libmncc/cause.h" #include "cnetz.h" diff --git a/src/common/Makefile.am b/src/common/Makefile.am deleted file mode 100644 index 4d2daab..0000000 --- a/src/common/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) - -noinst_LIBRARIES = libcommon.a - -libcommon_a_SOURCES = \ - debug.c - diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am index f95a0e6..10eef16 100644 --- a/src/jtacs/Makefile.am +++ b/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 \ diff --git a/src/libdebug/Makefile.am b/src/libdebug/Makefile.am new file mode 100644 index 0000000..7cef904 --- /dev/null +++ b/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 + diff --git a/src/common/debug.c b/src/libdebug/debug.c similarity index 100% rename from src/common/debug.c rename to src/libdebug/debug.c diff --git a/src/common/debug.h b/src/libdebug/debug.h similarity index 100% rename from src/common/debug.h rename to src/libdebug/debug.h diff --git a/src/libemphasis/emphasis.c b/src/libemphasis/emphasis.c index 7a43198..d9d192d 100644 --- a/src/libemphasis/emphasis.c +++ b/src/libemphasis/emphasis.c @@ -22,7 +22,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libfilter/iir_filter.h" #include "emphasis.h" diff --git a/src/libfsk/fsk.c b/src/libfsk/fsk.c index abdc147..726f3be 100644 --- a/src/libfsk/fsk.c +++ b/src/libfsk/fsk.c @@ -24,7 +24,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "fsk.h" #define PI M_PI diff --git a/src/libgoertzel/goertzel.c b/src/libgoertzel/goertzel.c index e99c697..d4038d6 100644 --- a/src/libgoertzel/goertzel.c +++ b/src/libgoertzel/goertzel.c @@ -23,7 +23,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "goertzel.h" /* diff --git a/src/libjitter/jitter.c b/src/libjitter/jitter.c index b1922fc..978e2ad 100644 --- a/src/libjitter/jitter.c +++ b/src/libjitter/jitter.c @@ -23,7 +23,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "jitter.h" /* create jitter buffer */ diff --git a/src/libmncc/mncc_console.c b/src/libmncc/mncc_console.c index 273e377..b1ae57c 100644 --- a/src/libmncc/mncc_console.c +++ b/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" diff --git a/src/libmncc/mncc_cross.c b/src/libmncc/mncc_cross.c index 36d3a64..d4f8f14 100644 --- a/src/libmncc/mncc_cross.c +++ b/src/libmncc/mncc_cross.c @@ -23,7 +23,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "cause.h" #include "mncc.h" diff --git a/src/libmncc/mncc_sock.c b/src/libmncc/mncc_sock.c index 5343a7e..bab4698 100644 --- a/src/libmncc/mncc_sock.c +++ b/src/libmncc/mncc_sock.c @@ -27,7 +27,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/call.h" #include "cause.h" #include "mncc_sock.h" diff --git a/src/libmobile/call.c b/src/libmobile/call.c index a3bce20..46edafc 100644 --- a/src/libmobile/call.c +++ b/src/libmobile/call.c @@ -25,7 +25,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "sender.h" #include "call.h" #include "../libtimer/timer.h" diff --git a/src/libmobile/main_mobile.c b/src/libmobile/main_mobile.c index 499e4c6..6dac38d 100644 --- a/src/libmobile/main_mobile.c +++ b/src/libmobile/main_mobile.c @@ -31,7 +31,7 @@ #include #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" diff --git a/src/libmobile/sender.c b/src/libmobile/sender.c index 4e47fd7..98ac1bb 100644 --- a/src/libmobile/sender.c +++ b/src/libmobile/sender.c @@ -25,7 +25,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "sender.h" #include "../libtimer/timer.h" diff --git a/src/libsdr/sdr.c b/src/libsdr/sdr.c index d9839a7..1660e3c 100644 --- a/src/libsdr/sdr.c +++ b/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 diff --git a/src/libsdr/soapy.c b/src/libsdr/soapy.c index 5def101..13797d1 100644 --- a/src/libsdr/soapy.c +++ b/src/libsdr/soapy.c @@ -26,7 +26,7 @@ #include #include #include "soapy.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" extern int sdr_rx_overflow; diff --git a/src/libsdr/uhd.c b/src/libsdr/uhd.c index 185fdf6..3f29cd0 100644 --- a/src/libsdr/uhd.c +++ b/src/libsdr/uhd.c @@ -25,7 +25,7 @@ #include #include #include "uhd.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" /* use to TX time stamp */ //#define TX_TIMESTAMP diff --git a/src/libsound/sound_alsa.c b/src/libsound/sound_alsa.c index cfd97bd..12318a7 100644 --- a/src/libsound/sound_alsa.c +++ b/src/libsound/sound_alsa.c @@ -22,7 +22,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmobile/sender.h" typedef struct sound { diff --git a/src/libsquelch/squelch.c b/src/libsquelch/squelch.c index 4337ba8..99dcb11 100644 --- a/src/libsquelch/squelch.c +++ b/src/libsquelch/squelch.c @@ -19,7 +19,7 @@ #include #include -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "squelch.h" #define CHAN squelch->chan diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am index 3bb3d4f..2eda683 100644 --- a/src/nmt/Makefile.am +++ b/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 \ diff --git a/src/nmt/dms.c b/src/nmt/dms.c index f71ddf7..a6e618b 100644 --- a/src/nmt/dms.c +++ b/src/nmt/dms.c @@ -22,7 +22,7 @@ #include #include #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 */ diff --git a/src/nmt/dsp.c b/src/nmt/dsp.c index d706860..84b1519 100644 --- a/src/nmt/dsp.c +++ b/src/nmt/dsp.c @@ -26,7 +26,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "nmt.h" #include "transaction.h" #include "dsp.h" diff --git a/src/nmt/frame.c b/src/nmt/frame.c index e699709..87a5e59 100644 --- a/src/nmt/frame.c +++ b/src/nmt/frame.c @@ -23,7 +23,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libhagelbarger/hagelbarger.h" #include "nmt.h" #include "frame.h" diff --git a/src/nmt/main.c b/src/nmt/main.c index 50f4851..5155c1c 100644 --- a/src/nmt/main.c +++ b/src/nmt/main.c @@ -28,7 +28,7 @@ #include #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" diff --git a/src/nmt/nmt.c b/src/nmt/nmt.c index 5eddd8a..ba36fa4 100644 --- a/src/nmt/nmt.c +++ b/src/nmt/nmt.c @@ -26,7 +26,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmncc/cause.h" #include "nmt.h" #include "transaction.h" diff --git a/src/nmt/sms.c b/src/nmt/sms.c index d36708d..4d8900d 100644 --- a/src/nmt/sms.c +++ b/src/nmt/sms.c @@ -24,7 +24,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "nmt.h" #define SMS_RECEIVE_TO 5.0 diff --git a/src/nmt/transaction.c b/src/nmt/transaction.c index ae35f97..39aed2f 100644 --- a/src/nmt/transaction.c +++ b/src/nmt/transaction.c @@ -22,7 +22,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "nmt.h" #include "transaction.h" diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am index 6010546..7bf973a 100644 --- a/src/r2000/Makefile.am +++ b/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 \ diff --git a/src/r2000/dsp.c b/src/r2000/dsp.c index 45de2c2..61b20e6 100644 --- a/src/r2000/dsp.c +++ b/src/r2000/dsp.c @@ -26,7 +26,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "r2000.h" #include "dsp.h" diff --git a/src/r2000/frame.c b/src/r2000/frame.c index ab0b9dd..51017cf 100644 --- a/src/r2000/frame.c +++ b/src/r2000/frame.c @@ -23,7 +23,7 @@ #include #include #include -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libhagelbarger/hagelbarger.h" #include "frame.h" diff --git a/src/r2000/main.c b/src/r2000/main.c index 2bd5a83..1a450f9 100644 --- a/src/r2000/main.c +++ b/src/r2000/main.c @@ -28,7 +28,7 @@ #include #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" diff --git a/src/r2000/r2000.c b/src/r2000/r2000.c index 4ddebaa..19258b4 100644 --- a/src/r2000/r2000.c +++ b/src/r2000/r2000.c @@ -26,7 +26,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../libmncc/cause.h" #include "r2000.h" //#include "transaction.h" diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am index d856105..5834906 100644 --- a/src/tacs/Makefile.am +++ b/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 \ diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 45852f0..81065c6 100644 --- a/src/test/Makefile.am +++ b/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) \ diff --git a/src/test/test_dms.c b/src/test/test_dms.c index 18459b7..1d3492f 100644 --- a/src/test/test_dms.c +++ b/src/test/test_dms.c @@ -5,7 +5,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../nmt/nmt.h" extern int dms_allow_loopback; diff --git a/src/test/test_emphasis.c b/src/test/test_emphasis.c index 7b87068..ef26761 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 "../common/debug.h" +#include "../libdebug/debug.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 8a30dab..2158937 100644 --- a/src/test/test_filter.c +++ b/src/test/test_filter.c @@ -4,7 +4,7 @@ #include #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) diff --git a/src/test/test_performance.c b/src/test/test_performance.c index 3da9246..5732b8b 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 "../common/debug.h" +#include "../libdebug/debug.h" struct timeval start_tv, tv; double duration; diff --git a/src/test/test_sms.c b/src/test/test_sms.c index 69f6a08..81946d0 100644 --- a/src/test/test_sms.c +++ b/src/test/test_sms.c @@ -5,7 +5,7 @@ #include #include #include "../libsample/sample.h" -#include "../common/debug.h" +#include "../libdebug/debug.h" #include "../nmt/nmt.h" static const uint8_t test_mo_sms_data1[] = { diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am index 22d5e1e..b4f6bd7 100644 --- a/src/tv/Makefile.am +++ b/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 \ diff --git a/src/tv/main.c b/src/tv/main.c index 4c2a2cc..e7cde20 100644 --- a/src/tv/main.c +++ b/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"