diff --git a/configure.ac b/configure.ac index e82f821d..e49c0e8c 100644 --- a/configure.ac +++ b/configure.ac @@ -61,38 +61,38 @@ AS_IF([test "x$with_alsa" != "xyes" -a "x$with_sdr" != "xyes"],[AC_MSG_NOTICE( W SOAPY_CFLAGS="$soapy_0_8_0_or_higher" AC_OUTPUT( - src/liboptions/Makefile - src/libdebug/Makefile - src/libmobile/Makefile - src/libdisplay/Makefile - src/libimage/Makefile - src/libsendevolumenregler/Makefile - src/libcompandor/Makefile - src/libgoertzel/Makefile - src/libjitter/Makefile - src/libsquelch/Makefile - src/libhagelbarger/Makefile - src/libdtmf/Makefile - src/libtimer/Makefile - src/libsamplerate/Makefile - src/libscrambler/Makefile - src/libemphasis/Makefile - src/libfsk/Makefile - src/libam/Makefile - src/libfm/Makefile - src/libfilter/Makefile - src/libwave/Makefile - src/libfft/Makefile - src/libsound/Makefile - src/libsdr/Makefile - src/libsample/Makefile - src/libclipper/Makefile - src/libserial/Makefile - src/libv27/Makefile - src/libmtp/Makefile - src/libosmocc/Makefile - src/libg711/Makefile - src/libaaimage/Makefile + src/lib/liboptions/Makefile + src/lib/libdebug/Makefile + src/lib/libmobile/Makefile + src/lib/libdisplay/Makefile + src/lib/libimage/Makefile + src/lib/libsendevolumenregler/Makefile + src/lib/libcompandor/Makefile + src/lib/libgoertzel/Makefile + src/lib/libjitter/Makefile + src/lib/libsquelch/Makefile + src/lib/libhagelbarger/Makefile + src/lib/libdtmf/Makefile + src/lib/libtimer/Makefile + src/lib/libsamplerate/Makefile + src/lib/libscrambler/Makefile + src/lib/libemphasis/Makefile + src/lib/libfsk/Makefile + src/lib/libam/Makefile + src/lib/libfm/Makefile + src/lib/libfilter/Makefile + src/lib/libwave/Makefile + src/lib/libfft/Makefile + src/lib/libsound/Makefile + src/lib/libsdr/Makefile + src/lib/libsample/Makefile + src/lib/libclipper/Makefile + src/lib/libserial/Makefile + src/lib/libv27/Makefile + src/lib/libmtp/Makefile + src/lib/libosmocc/Makefile + src/lib/libg711/Makefile + src/lib/libaaimage/Makefile src/anetz/Makefile src/bnetz/Makefile src/cnetz/Makefile diff --git a/extra/Makefile.am b/extra/Makefile.am index 5cf7c2fe..3876c83e 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../src/lib bin_PROGRAMS = \ cnetz_memory_card_generator @@ -7,6 +7,6 @@ cnetz_memory_card_generator_SOURCES = \ main.c cnetz_memory_card_generator_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/liboptions/liboptions.a + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a diff --git a/extra/main.c b/extra/main.c index 1a7b0b78..b350a5e2 100644 --- a/extra/main.c +++ b/extra/main.c @@ -22,8 +22,8 @@ #include #include #include -#include <../src/libdebug/debug.h> -#include <../src/liboptions/options.h> +#include +#include int num_kanal = 1; static uint8_t magic1 = 0x1e; diff --git a/src/Makefile.am b/src/Makefile.am index 665a6a83..be5526c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,45 +1,45 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = \ - liboptions \ - libdebug \ - libmobile \ - libdisplay \ - libsample \ - libimage \ - libsendevolumenregler \ - libcompandor \ - libgoertzel \ - libjitter \ - libsquelch \ - libhagelbarger \ - libdtmf \ - libtimer \ - libsamplerate \ - libscrambler \ - libemphasis \ - libfsk \ - libam \ - libfm \ - libfilter \ - libwave \ - libfft \ - libclipper \ - libserial \ - libv27 \ - libmtp \ - libosmocc \ - libg711 \ - libaaimage + lib/liboptions \ + lib/libdebug \ + lib/libmobile \ + lib/libdisplay \ + lib/libsample \ + lib/libimage \ + lib/libsendevolumenregler \ + lib/libcompandor \ + lib/libgoertzel \ + lib/libjitter \ + lib/libsquelch \ + lib/libhagelbarger \ + lib/libdtmf \ + lib/libtimer \ + lib/libsamplerate \ + lib/libscrambler \ + lib/libemphasis \ + lib/libfsk \ + lib/libam \ + lib/libfm \ + lib/libfilter \ + lib/libwave \ + lib/libfft \ + lib/libclipper \ + lib/libserial \ + lib/libv27 \ + lib/libmtp \ + lib/libosmocc \ + lib/libg711 \ + lib/libaaimage if HAVE_ALSA SUBDIRS += \ - libsound + lib/libsound endif if HAVE_SDR SUBDIRS += \ - libsdr + lib/libsdr endif SUBDIRS += \ diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am index 82da289e..844a4b6c 100644 --- a/src/amps/Makefile.am +++ b/src/amps/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ amps @@ -29,36 +29,36 @@ amps_LDADD = \ $(COMMON_LA) \ libamps.a \ libusatone.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.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/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libgoertzel/libgoertzel.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA amps_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR amps_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/amps/amps.c b/src/amps/amps.c index 870da276..a198209f 100644 --- a/src/amps/amps.c +++ b/src/amps/amps.c @@ -42,11 +42,11 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include #include "amps.h" #include "dsp.h" #include "frame.h" diff --git a/src/amps/amps.h b/src/amps/amps.h index 71bbc473..d5451424 100644 --- a/src/amps/amps.h +++ b/src/amps/amps.h @@ -1,7 +1,7 @@ -#include "../libgoertzel/goertzel.h" -#include "../libmobile/sender.h" -#include "../libtimer/timer.h" -#include "../libcompandor/compandor.h" +#include +#include +#include +#include typedef struct amps amps_t; #include "sysinfo.h" #include "transaction.h" diff --git a/src/amps/amps_tacs_main.c b/src/amps/amps_tacs_main.c index fe9cc025..bd6914d9 100644 --- a/src/amps/amps_tacs_main.c +++ b/src/amps/amps_tacs_main.c @@ -22,12 +22,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/main_mobile.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../liboptions/options.h" -#include "../libfm/fm.h" +#include +#include +#include +#include +#include +#include #include "amps.h" #include "dsp.h" #include "frame.h" diff --git a/src/amps/dsp.c b/src/amps/dsp.c index efd06c01..82216e5e 100644 --- a/src/amps/dsp.c +++ b/src/amps/dsp.c @@ -81,9 +81,9 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" +#include +#include +#include #include "amps.h" #include "frame.h" #include "dsp.h" diff --git a/src/amps/frame.c b/src/amps/frame.c index 1c5610cc..2cfacb9f 100644 --- a/src/amps/frame.c +++ b/src/amps/frame.c @@ -26,8 +26,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "amps.h" #include "dsp.h" #include "frame.h" diff --git a/src/amps/sysinfo.c b/src/amps/sysinfo.c index 1758de70..53b0dd87 100644 --- a/src/amps/sysinfo.c +++ b/src/amps/sysinfo.c @@ -3,7 +3,7 @@ #include #include #include -#include "../libsample/sample.h" +#include #include "amps.h" #include "frame.h" #include "main.h" diff --git a/src/amps/transaction.c b/src/amps/transaction.c index 2d25313a..539a72ed 100644 --- a/src/amps/transaction.c +++ b/src/amps/transaction.c @@ -20,10 +20,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" +#include +#include +#include +#include #include "amps.h" //#include "database.h" diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am index 66de260b..c21b67f0 100644 --- a/src/anetz/Makefile.am +++ b/src/anetz/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ anetz @@ -18,36 +18,36 @@ anetz_SOURCES = \ anetz_LDADD = \ $(COMMON_LA) \ libgermanton.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.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/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libgoertzel/libgoertzel.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libsquelch/libsquelch.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA anetz_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR anetz_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/anetz/anetz.c b/src/anetz/anetz.c index d5e1a76e..3a7a8924 100644 --- a/src/anetz/anetz.c +++ b/src/anetz/anetz.c @@ -24,12 +24,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include +#include #include "anetz.h" #include "dsp.h" diff --git a/src/anetz/anetz.h b/src/anetz/anetz.h index fc04d95b..cd48357e 100644 --- a/src/anetz/anetz.h +++ b/src/anetz/anetz.h @@ -1,6 +1,6 @@ -#include "../libsquelch/squelch.h" -#include "../libgoertzel/goertzel.h" -#include "../libmobile/sender.h" +#include +#include +#include enum dsp_mode { DSP_MODE_SILENCE, /* send silence to transmitter, block audio from receiver */ diff --git a/src/anetz/dsp.c b/src/anetz/dsp.c index 1bc20a12..6e95cf2c 100644 --- a/src/anetz/dsp.c +++ b/src/anetz/dsp.c @@ -25,10 +25,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" -#include "../libmobile/call.h" +#include +#include +#include +#include #include "anetz.h" #include "dsp.h" diff --git a/src/anetz/main.c b/src/anetz/main.c index cd6f0151..36b793ff 100644 --- a/src/anetz/main.c +++ b/src/anetz/main.c @@ -23,13 +23,13 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/main_mobile.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" -#include "../libmobile/call.h" -#include "../liboptions/options.h" -#include "../libfm/fm.h" +#include +#include +#include +#include +#include +#include +#include #include "freiton.h" #include "besetztton.h" #include "anetz.h" diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am index a7992563..102b09cd 100644 --- a/src/bnetz/Makefile.am +++ b/src/bnetz/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ bnetz \ @@ -15,23 +15,23 @@ bnetz_SOURCES = \ bnetz_LDADD = \ $(COMMON_LA) \ ../anetz/libgermanton.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libsquelch/libsquelch.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfsk/libfsk.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libsquelch/libsquelch.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfsk/libfsk.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm bnetz_dialer_SOURCES = \ @@ -39,31 +39,31 @@ bnetz_dialer_SOURCES = \ dialer.c bnetz_dialer_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libfsk/libfsk.a \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libfilter/libfilter.a \ - $(top_builddir)/src/libwave/libwave.a \ - $(top_builddir)/src/libsample/libsample.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libfsk/libfsk.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ $(ALSA_LIBS) -lm if HAVE_ALSA bnetz_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) bnetz_dialer_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR bnetz_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/bnetz/bnetz.c b/src/bnetz/bnetz.c index 6788dedb..08305d6c 100644 --- a/src/bnetz/bnetz.c +++ b/src/bnetz/bnetz.c @@ -24,11 +24,11 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include #include "bnetz.h" #include "telegramm.h" #include "dsp.h" diff --git a/src/bnetz/bnetz.h b/src/bnetz/bnetz.h index fa19cd03..feec3e75 100644 --- a/src/bnetz/bnetz.h +++ b/src/bnetz/bnetz.h @@ -1,7 +1,7 @@ -#include "../libsquelch/squelch.h" -#include "../libfsk/fsk.h" -#include "../libmobile/sender.h" -#include "../libtimer/timer.h" +#include +#include +#include +#include /* fsk modes of transmission */ enum dsp_mode { diff --git a/src/bnetz/dialer.c b/src/bnetz/dialer.c index ab625b6c..98eafb91 100644 --- a/src/bnetz/dialer.c +++ b/src/bnetz/dialer.c @@ -23,14 +23,14 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libfsk/fsk.h" -#include "../libwave/wave.h" -#include "../libdebug/debug.h" +#include +#include +#include +#include #ifdef HAVE_ALSA -#include "../libsound/sound.h" +#include #endif -#include "../liboptions/options.h" +#include #include "telegramm.h" #define MAX_PAUSE 0.5 /* pause before and after dialing sequence */ diff --git a/src/bnetz/dsp.c b/src/bnetz/dsp.c index 73b70a76..f3db571a 100644 --- a/src/bnetz/dsp.c +++ b/src/bnetz/dsp.c @@ -25,9 +25,9 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" +#include +#include +#include #include "bnetz.h" #include "dsp.h" diff --git a/src/bnetz/main.c b/src/bnetz/main.c index a82e4123..19687b73 100644 --- a/src/bnetz/main.c +++ b/src/bnetz/main.c @@ -23,13 +23,13 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/main_mobile.h" +#include +#include +#include +#include #include "../anetz/freiton.h" #include "../anetz/besetztton.h" -#include "../liboptions/options.h" +#include #include "bnetz.h" #include "dsp.h" #include "stations.h" diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am index 3c521bde..f79ae0c2 100644 --- a/src/cnetz/Makefile.am +++ b/src/cnetz/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ cnetz @@ -23,36 +23,36 @@ cnetz_LDADD = \ $(COMMON_LA) \ ../anetz/libgermanton.a \ libcnetztones.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libcompandor/libcompandor.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libscrambler/libscrambler.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libscrambler/libscrambler.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA cnetz_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR cnetz_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/cnetz/cnetz.c b/src/cnetz/cnetz.c index e276d624..1bdebbcd 100644 --- a/src/cnetz/cnetz.c +++ b/src/cnetz/cnetz.c @@ -142,11 +142,11 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include #include "cnetz.h" #include "database.h" #include "sysinfo.h" diff --git a/src/cnetz/cnetz.h b/src/cnetz/cnetz.h index 3d074b8c..ad7ebafb 100644 --- a/src/cnetz/cnetz.h +++ b/src/cnetz/cnetz.h @@ -1,7 +1,7 @@ -#include "../libcompandor/compandor.h" -#include "../libtimer/timer.h" -#include "../libmobile/sender.h" -#include "../libscrambler/scrambler.h" +#include +#include +#include +#include typedef struct cnetz cnetz_t; #include "fsk_demod.h" #include "transaction.h" diff --git a/src/cnetz/database.c b/src/cnetz/database.c index 86cc8ffc..9a34ae1b 100644 --- a/src/cnetz/database.c +++ b/src/cnetz/database.c @@ -21,8 +21,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "cnetz.h" #include "database.h" diff --git a/src/cnetz/dsp.c b/src/cnetz/dsp.c index eb363237..3a46c9fc 100644 --- a/src/cnetz/dsp.c +++ b/src/cnetz/dsp.c @@ -25,9 +25,9 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" +#include +#include +#include #include "cnetz.h" #include "sysinfo.h" #include "telegramm.h" diff --git a/src/cnetz/fsk_demod.c b/src/cnetz/fsk_demod.c index 5ffc8fb1..72bf5a39 100644 --- a/src/cnetz/fsk_demod.c +++ b/src/cnetz/fsk_demod.c @@ -128,8 +128,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "cnetz.h" #include "dsp.h" #include "telegramm.h" diff --git a/src/cnetz/main.c b/src/cnetz/main.c index 1c4dbbad..730021d2 100644 --- a/src/cnetz/main.c +++ b/src/cnetz/main.c @@ -22,14 +22,14 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/main_mobile.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" +#include +#include +#include +#include #include "../anetz/freiton.h" #include "../anetz/besetztton.h" -#include "../liboptions/options.h" -#include "../libfm/fm.h" +#include +#include #include "cnetz.h" #include "database.h" #include "sysinfo.h" diff --git a/src/cnetz/telegramm.c b/src/cnetz/telegramm.c index 51b78d62..e9229e1e 100644 --- a/src/cnetz/telegramm.c +++ b/src/cnetz/telegramm.c @@ -26,8 +26,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "cnetz.h" #include "dsp.h" #include "sysinfo.h" diff --git a/src/cnetz/transaction.c b/src/cnetz/transaction.c index cf5dbeff..fa9777d1 100644 --- a/src/cnetz/transaction.c +++ b/src/cnetz/transaction.c @@ -20,10 +20,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" +#include +#include +#include +#include #include "cnetz.h" #include "telegramm.h" #include "database.h" diff --git a/src/eurosignal/Makefile.am b/src/eurosignal/Makefile.am index 9ec88376..9c16b662 100644 --- a/src/eurosignal/Makefile.am +++ b/src/eurosignal/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ eurosignal @@ -15,36 +15,36 @@ eurosignal_SOURCES = \ eurosignal_LDADD = \ $(COMMON_LA) \ ../anetz/libgermanton.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfsk/libfsk.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfsk/libfsk.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA eurosignal_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR eurosignal_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/eurosignal/dsp.c b/src/eurosignal/dsp.c index dc8bf929..d560c196 100644 --- a/src/eurosignal/dsp.c +++ b/src/eurosignal/dsp.c @@ -25,8 +25,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "eurosignal.h" #include "dsp.h" diff --git a/src/eurosignal/eurosignal.c b/src/eurosignal/eurosignal.c index 5ad37d1e..36b63b8f 100644 --- a/src/eurosignal/eurosignal.c +++ b/src/eurosignal/eurosignal.c @@ -25,11 +25,11 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include #include "eurosignal.h" #include "dsp.h" diff --git a/src/eurosignal/eurosignal.h b/src/eurosignal/eurosignal.h index bcb2bc1a..10ebad98 100644 --- a/src/eurosignal/eurosignal.h +++ b/src/eurosignal/eurosignal.h @@ -1,6 +1,6 @@ -#include "../libfm/fm.h" -#include "../libmobile/sender.h" -#include "../libtimer/timer.h" +#include +#include +#include /* current state of transmitter */ enum euro_health_state { diff --git a/src/eurosignal/main.c b/src/eurosignal/main.c index 8d0b5bc3..d5c22ce8 100644 --- a/src/eurosignal/main.c +++ b/src/eurosignal/main.c @@ -22,11 +22,11 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/main_mobile.h" -#include "../liboptions/options.h" +#include +#include +#include +#include +#include #include "eurosignal.h" #include "dsp.h" #include "../anetz/besetztton.h" diff --git a/src/fuenf/Makefile.am b/src/fuenf/Makefile.am index 4c907625..d723ef5b 100644 --- a/src/fuenf/Makefile.am +++ b/src/fuenf/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ 5-ton-folge @@ -11,36 +11,36 @@ bin_PROGRAMS = \ 5_ton_folge_LDADD = \ $(COMMON_LA) \ ../anetz/libgermanton.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libgoertzel/libgoertzel.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libgoertzel/libgoertzel.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA 5_ton_folge_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR 5_ton_folge_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/fuenf/dsp.c b/src/fuenf/dsp.c index b3f10f89..4a7b2e0d 100644 --- a/src/fuenf/dsp.c +++ b/src/fuenf/dsp.c @@ -25,9 +25,9 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" +#include +#include +#include #include "fuenf.h" #include "dsp.h" diff --git a/src/fuenf/fuenf.c b/src/fuenf/fuenf.c index 4a3eb903..fc176d52 100644 --- a/src/fuenf/fuenf.c +++ b/src/fuenf/fuenf.c @@ -25,12 +25,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" -#include "../liboptions/options.h" +#include +#include +#include +#include +#include +#include #include "fuenf.h" #include "dsp.h" diff --git a/src/fuenf/fuenf.h b/src/fuenf/fuenf.h index cb335c74..77eb6ea4 100644 --- a/src/fuenf/fuenf.h +++ b/src/fuenf/fuenf.h @@ -1,6 +1,6 @@ -#include "../libmobile/sender.h" -#include "../libgoertzel/goertzel.h" -#include "../libfm/fm.h" +#include +#include +#include enum fuenf_state { FUENF_STATE_IDLE = 0, diff --git a/src/fuenf/main.c b/src/fuenf/main.c index ab7fa1c0..9a69f8cd 100644 --- a/src/fuenf/main.c +++ b/src/fuenf/main.c @@ -26,11 +26,11 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/main_mobile.h" -#include "../liboptions/options.h" +#include +#include +#include +#include +#include #include "../anetz/besetztton.h" #include "fuenf.h" #include "dsp.h" diff --git a/src/fuvst/Makefile.am b/src/fuvst/Makefile.am index 46ac99b1..53252f27 100644 --- a/src/fuvst/Makefile.am +++ b/src/fuvst/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib if HAVE_ALSA bin_PROGRAMS = \ @@ -14,26 +14,26 @@ fuvst_LDADD = \ $(COMMON_LA) \ ../anetz/libgermanton.a \ ../cnetz/libcnetztones.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libcompandor/libcompandor.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libscrambler/libscrambler.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libv27/libv27.a \ - $(top_builddir)/src/libmtp/libmtp.a \ - $(top_builddir)/src/libfilter/libfilter.a \ - $(top_builddir)/src/libwave/libwave.a \ - $(top_builddir)/src/libsample/libsample.a \ - $(top_builddir)/src/libsound/libsound.a \ - $(top_builddir)/src/libg711/libg711.a \ - $(top_builddir)/src/libaaimage/libaaimage.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libscrambler/libscrambler.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libv27/libv27.a \ + $(top_builddir)/src/lib/libmtp/libmtp.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ $(ALSA_LIBS) \ -lm @@ -41,41 +41,41 @@ fuvst_sniffer_SOURCES = \ sniffer.c fuvst_sniffer_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libcompandor/libcompandor.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libscrambler/libscrambler.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libv27/libv27.a \ - $(top_builddir)/src/libmtp/libmtp.a \ - $(top_builddir)/src/libfilter/libfilter.a \ - $(top_builddir)/src/libwave/libwave.a \ - $(top_builddir)/src/libsample/libsample.a \ - $(top_builddir)/src/libsound/libsound.a \ - $(top_builddir)/src/libg711/libg711.a \ - $(top_builddir)/src/libaaimage/libaaimage.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libscrambler/libscrambler.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libv27/libv27.a \ + $(top_builddir)/src/lib/libmtp/libmtp.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ $(ALSA_LIBS) \ -lm if HAVE_SDR fuvst_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) fuvst_sniffer_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/fuvst/fuvst.c b/src/fuvst/fuvst.c index dc5da167..e3440ed7 100755 --- a/src/fuvst/fuvst.c +++ b/src/fuvst/fuvst.c @@ -34,13 +34,13 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../liboptions/options.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libtimer/timer.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include +#include +#include #include "fuvst.h" /* digital loopback test */ diff --git a/src/fuvst/fuvst.h b/src/fuvst/fuvst.h index 1177606b..e03afa5a 100755 --- a/src/fuvst/fuvst.h +++ b/src/fuvst/fuvst.h @@ -1,7 +1,7 @@ -#include "../libmobile/sender.h" -#include "../libscrambler/scrambler.h" -#include "../libv27/modem.h" -#include "../libmtp/mtp.h" +#include +#include +#include +#include #include "mup.h" enum fuvst_chan_type { diff --git a/src/fuvst/main.c b/src/fuvst/main.c index 7a18da01..b882edd0 100755 --- a/src/fuvst/main.c +++ b/src/fuvst/main.c @@ -22,13 +22,13 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/main_mobile.h" -#include "../libtimer/timer.h" -#include "../liboptions/options.h" -#include "../libfm/fm.h" +#include +#include +#include +#include +#include +#include +#include #include "../anetz/freiton.h" #include "../anetz/besetztton.h" #include "../cnetz/ansage.h" diff --git a/src/fuvst/mup.c b/src/fuvst/mup.c index 7224fb43..8d6277a6 100755 --- a/src/fuvst/mup.c +++ b/src/fuvst/mup.c @@ -23,7 +23,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #include "mup.h" #include "systemmeldungen.h" diff --git a/src/fuvst/sniffer.c b/src/fuvst/sniffer.c index 570919d7..bc271df5 100644 --- a/src/fuvst/sniffer.c +++ b/src/fuvst/sniffer.c @@ -22,16 +22,16 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libtimer/timer.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/main_mobile.h" -#include "../liboptions/options.h" -#include "../libmobile/sender.h" -#include "../libv27/modem.h" -#include "../libmtp/mtp.h" -#include "../libfm/fm.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include typedef struct sniffer { sender_t sender; diff --git a/src/fuvst/systemmeldungen.c b/src/fuvst/systemmeldungen.c index 1d801eee..a6301549 100644 --- a/src/fuvst/systemmeldungen.c +++ b/src/fuvst/systemmeldungen.c @@ -1,6 +1,6 @@ #include #include -#include "../libdebug/debug.h" +#include #include "systemmeldungen.h" static struct systemmeldungen { diff --git a/src/imts/Makefile.am b/src/imts/Makefile.am index 9dd0cc17..04c97283 100644 --- a/src/imts/Makefile.am +++ b/src/imts/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ imts \ @@ -12,22 +12,22 @@ imts_SOURCES = \ imts_LDADD = \ $(COMMON_LA) \ ../amps/libusatone.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libsquelch/libsquelch.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libsquelch/libsquelch.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm imts_dialer_SOURCES = \ @@ -35,27 +35,27 @@ imts_dialer_SOURCES = \ imts_dialer_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libwave/libwave.a \ - $(top_builddir)/src/libsample/libsample.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ -lm if HAVE_ALSA imts_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) imts_dialer_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR imts_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/imts/dialer.c b/src/imts/dialer.c index f7f2edb4..66b6caa2 100644 --- a/src/imts/dialer.c +++ b/src/imts/dialer.c @@ -24,13 +24,13 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libwave/wave.h" -#include "../libdebug/debug.h" +#include +#include +#include #ifdef HAVE_ALSA -#include "../libsound/sound.h" +#include #endif -#include "../liboptions/options.h" +#include /* presets */ const char *station_id = "6681739"; diff --git a/src/imts/dsp.c b/src/imts/dsp.c index 94366fa7..7e899194 100644 --- a/src/imts/dsp.c +++ b/src/imts/dsp.c @@ -25,10 +25,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" -#include "../libmobile/call.h" +#include +#include +#include +#include #include "imts.h" #include "dsp.h" diff --git a/src/imts/imts.c b/src/imts/imts.c index 8a331236..b0c98820 100644 --- a/src/imts/imts.c +++ b/src/imts/imts.c @@ -38,12 +38,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include +#include #include "imts.h" #include "dsp.h" diff --git a/src/imts/imts.h b/src/imts/imts.h index d754c903..6cc2a2b4 100644 --- a/src/imts/imts.h +++ b/src/imts/imts.h @@ -1,6 +1,6 @@ -#include "../libsquelch/squelch.h" -#include "../libfm/fm.h" -#include "../libmobile/sender.h" +#include +#include +#include enum dsp_mode { DSP_MODE_OFF = 0, /* transmitter off */ diff --git a/src/imts/main.c b/src/imts/main.c index dace3479..f6dbdfb4 100644 --- a/src/imts/main.c +++ b/src/imts/main.c @@ -23,12 +23,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/main_mobile.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" -#include "../libmobile/call.h" -#include "../liboptions/options.h" +#include +#include +#include +#include +#include +#include #include "../amps/tones.h" #include "../amps/outoforder.h" #include "../amps/noanswer.h" diff --git a/src/jolly/Makefile.am b/src/jolly/Makefile.am index a968f899..5105084b 100644 --- a/src/jolly/Makefile.am +++ b/src/jolly/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ jollycom @@ -11,36 +11,36 @@ jollycom_SOURCES = \ jollycom_LDADD = \ $(COMMON_LA) \ ../anetz/libgermanton.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libsquelch/libsquelch.a \ - $(top_builddir)/src/libdtmf/libdtmf.a \ - $(top_builddir)/src/libtimer/libtimer.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/libfm/libfm.a \ - $(top_builddir)/src/libg711/libg711.a \ - $(top_builddir)/src/libaaimage/libaaimage.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libsquelch/libsquelch.a \ + $(top_builddir)/src/lib/libdtmf/libdtmf.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA jollycom_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR jollycom_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/jolly/dsp.c b/src/jolly/dsp.c index dfd694b3..9b92a070 100644 --- a/src/jolly/dsp.c +++ b/src/jolly/dsp.c @@ -26,10 +26,10 @@ #include #include -#include "../libsample/sample.h" -#include "../libtimer/timer.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" +#include +#include +#include +#include #include "jolly.h" #include "dsp.h" #include "voice.h" diff --git a/src/jolly/jolly.c b/src/jolly/jolly.c index a979806d..3e663765 100644 --- a/src/jolly/jolly.c +++ b/src/jolly/jolly.c @@ -133,12 +133,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include +#include #include "jolly.h" #include "dsp.h" #include "voice.h" diff --git a/src/jolly/jolly.h b/src/jolly/jolly.h index 226cb61a..17e3a949 100644 --- a/src/jolly/jolly.h +++ b/src/jolly/jolly.h @@ -1,6 +1,6 @@ -#include "../libsquelch/squelch.h" -#include "../libmobile/sender.h" -#include "../libdtmf/dtmf_decode.h" +#include +#include +#include enum jolly_state { STATE_NULL = 0, diff --git a/src/jolly/main.c b/src/jolly/main.c index 254337ba..f7e46051 100644 --- a/src/jolly/main.c +++ b/src/jolly/main.c @@ -27,13 +27,13 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/main_mobile.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" +#include +#include +#include +#include #include "../anetz/freiton.h" #include "../anetz/besetztton.h" -#include "../liboptions/options.h" +#include #include "jolly.h" #include "dsp.h" #include "voice.h" diff --git a/src/jolly/voice.c b/src/jolly/voice.c index 28226080..44bcb5e0 100644 --- a/src/jolly/voice.c +++ b/src/jolly/voice.c @@ -1,8 +1,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libsamplerate/samplerate.h" +#include +#include #include "voice.h" static int16_t digit_0[] = { diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am index 5c2b4960..1e0a33ee 100644 --- a/src/jtacs/Makefile.am +++ b/src/jtacs/Makefile.am @@ -12,36 +12,36 @@ jtacs_SOURCES = \ jtacs_LDADD = \ $(COMMON_LA) \ ../amps/libamps.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.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/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libgoertzel/libgoertzel.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA jtacs_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR jtacs_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/libaaimage/Makefile.am b/src/lib/libaaimage/Makefile.am similarity index 100% rename from src/libaaimage/Makefile.am rename to src/lib/libaaimage/Makefile.am diff --git a/src/libaaimage/aaimage.c b/src/lib/libaaimage/aaimage.c similarity index 100% rename from src/libaaimage/aaimage.c rename to src/lib/libaaimage/aaimage.c diff --git a/src/libaaimage/aaimage.h b/src/lib/libaaimage/aaimage.h similarity index 100% rename from src/libaaimage/aaimage.h rename to src/lib/libaaimage/aaimage.h diff --git a/src/libam/Makefile.am b/src/lib/libam/Makefile.am similarity index 100% rename from src/libam/Makefile.am rename to src/lib/libam/Makefile.am diff --git a/src/libam/am.c b/src/lib/libam/am.c similarity index 100% rename from src/libam/am.c rename to src/lib/libam/am.c diff --git a/src/libam/am.h b/src/lib/libam/am.h similarity index 100% rename from src/libam/am.h rename to src/lib/libam/am.h diff --git a/src/libclipper/Makefile.am b/src/lib/libclipper/Makefile.am similarity index 100% rename from src/libclipper/Makefile.am rename to src/lib/libclipper/Makefile.am diff --git a/src/libclipper/clipper.c b/src/lib/libclipper/clipper.c similarity index 100% rename from src/libclipper/clipper.c rename to src/lib/libclipper/clipper.c diff --git a/src/libclipper/clipper.h b/src/lib/libclipper/clipper.h similarity index 100% rename from src/libclipper/clipper.h rename to src/lib/libclipper/clipper.h diff --git a/src/libcompandor/Makefile.am b/src/lib/libcompandor/Makefile.am similarity index 100% rename from src/libcompandor/Makefile.am rename to src/lib/libcompandor/Makefile.am diff --git a/src/libcompandor/compandor.c b/src/lib/libcompandor/compandor.c similarity index 100% rename from src/libcompandor/compandor.c rename to src/lib/libcompandor/compandor.c diff --git a/src/libcompandor/compandor.h b/src/lib/libcompandor/compandor.h similarity index 100% rename from src/libcompandor/compandor.h rename to src/lib/libcompandor/compandor.h diff --git a/src/libdebug/Makefile.am b/src/lib/libdebug/Makefile.am similarity index 100% rename from src/libdebug/Makefile.am rename to src/lib/libdebug/Makefile.am diff --git a/src/libdebug/debug.c b/src/lib/libdebug/debug.c similarity index 100% rename from src/libdebug/debug.c rename to src/lib/libdebug/debug.c diff --git a/src/libdebug/debug.h b/src/lib/libdebug/debug.h similarity index 100% rename from src/libdebug/debug.h rename to src/lib/libdebug/debug.h diff --git a/src/libdisplay/Makefile.am b/src/lib/libdisplay/Makefile.am similarity index 100% rename from src/libdisplay/Makefile.am rename to src/lib/libdisplay/Makefile.am diff --git a/src/libdisplay/display.h b/src/lib/libdisplay/display.h similarity index 100% rename from src/libdisplay/display.h rename to src/lib/libdisplay/display.h diff --git a/src/libdisplay/display_iq.c b/src/lib/libdisplay/display_iq.c similarity index 100% rename from src/libdisplay/display_iq.c rename to src/lib/libdisplay/display_iq.c diff --git a/src/libdisplay/display_measurements.c b/src/lib/libdisplay/display_measurements.c similarity index 100% rename from src/libdisplay/display_measurements.c rename to src/lib/libdisplay/display_measurements.c diff --git a/src/libdisplay/display_spectrum.c b/src/lib/libdisplay/display_spectrum.c similarity index 100% rename from src/libdisplay/display_spectrum.c rename to src/lib/libdisplay/display_spectrum.c diff --git a/src/libdisplay/display_status.c b/src/lib/libdisplay/display_status.c similarity index 100% rename from src/libdisplay/display_status.c rename to src/lib/libdisplay/display_status.c diff --git a/src/libdisplay/display_wave.c b/src/lib/libdisplay/display_wave.c similarity index 100% rename from src/libdisplay/display_wave.c rename to src/lib/libdisplay/display_wave.c diff --git a/src/libdtmf/Makefile.am b/src/lib/libdtmf/Makefile.am similarity index 100% rename from src/libdtmf/Makefile.am rename to src/lib/libdtmf/Makefile.am diff --git a/src/libdtmf/dtmf_decode.c b/src/lib/libdtmf/dtmf_decode.c similarity index 100% rename from src/libdtmf/dtmf_decode.c rename to src/lib/libdtmf/dtmf_decode.c diff --git a/src/libdtmf/dtmf_decode.h b/src/lib/libdtmf/dtmf_decode.h similarity index 100% rename from src/libdtmf/dtmf_decode.h rename to src/lib/libdtmf/dtmf_decode.h diff --git a/src/libdtmf/dtmf_encode.c b/src/lib/libdtmf/dtmf_encode.c similarity index 100% rename from src/libdtmf/dtmf_encode.c rename to src/lib/libdtmf/dtmf_encode.c diff --git a/src/libdtmf/dtmf_encode.h b/src/lib/libdtmf/dtmf_encode.h similarity index 100% rename from src/libdtmf/dtmf_encode.h rename to src/lib/libdtmf/dtmf_encode.h diff --git a/src/libemphasis/Makefile.am b/src/lib/libemphasis/Makefile.am similarity index 100% rename from src/libemphasis/Makefile.am rename to src/lib/libemphasis/Makefile.am diff --git a/src/libemphasis/emphasis.c b/src/lib/libemphasis/emphasis.c similarity index 100% rename from src/libemphasis/emphasis.c rename to src/lib/libemphasis/emphasis.c diff --git a/src/libemphasis/emphasis.h b/src/lib/libemphasis/emphasis.h similarity index 100% rename from src/libemphasis/emphasis.h rename to src/lib/libemphasis/emphasis.h diff --git a/src/libfft/Makefile.am b/src/lib/libfft/Makefile.am similarity index 100% rename from src/libfft/Makefile.am rename to src/lib/libfft/Makefile.am diff --git a/src/libfft/fft.c b/src/lib/libfft/fft.c similarity index 100% rename from src/libfft/fft.c rename to src/lib/libfft/fft.c diff --git a/src/libfft/fft.h b/src/lib/libfft/fft.h similarity index 100% rename from src/libfft/fft.h rename to src/lib/libfft/fft.h diff --git a/src/libfilter/Makefile.am b/src/lib/libfilter/Makefile.am similarity index 100% rename from src/libfilter/Makefile.am rename to src/lib/libfilter/Makefile.am diff --git a/src/libfilter/fir_filter.c b/src/lib/libfilter/fir_filter.c similarity index 100% rename from src/libfilter/fir_filter.c rename to src/lib/libfilter/fir_filter.c diff --git a/src/libfilter/fir_filter.h b/src/lib/libfilter/fir_filter.h similarity index 100% rename from src/libfilter/fir_filter.h rename to src/lib/libfilter/fir_filter.h diff --git a/src/libfilter/iir_filter.c b/src/lib/libfilter/iir_filter.c similarity index 100% rename from src/libfilter/iir_filter.c rename to src/lib/libfilter/iir_filter.c diff --git a/src/libfilter/iir_filter.h b/src/lib/libfilter/iir_filter.h similarity index 100% rename from src/libfilter/iir_filter.h rename to src/lib/libfilter/iir_filter.h diff --git a/src/libfm/Makefile.am b/src/lib/libfm/Makefile.am similarity index 100% rename from src/libfm/Makefile.am rename to src/lib/libfm/Makefile.am diff --git a/src/libfm/fm.c b/src/lib/libfm/fm.c similarity index 100% rename from src/libfm/fm.c rename to src/lib/libfm/fm.c diff --git a/src/libfm/fm.h b/src/lib/libfm/fm.h similarity index 100% rename from src/libfm/fm.h rename to src/lib/libfm/fm.h diff --git a/src/libfsk/Makefile.am b/src/lib/libfsk/Makefile.am similarity index 100% rename from src/libfsk/Makefile.am rename to src/lib/libfsk/Makefile.am diff --git a/src/libfsk/fsk.c b/src/lib/libfsk/fsk.c similarity index 100% rename from src/libfsk/fsk.c rename to src/lib/libfsk/fsk.c diff --git a/src/libfsk/fsk.h b/src/lib/libfsk/fsk.h similarity index 100% rename from src/libfsk/fsk.h rename to src/lib/libfsk/fsk.h diff --git a/src/libg711/Makefile.am b/src/lib/libg711/Makefile.am similarity index 100% rename from src/libg711/Makefile.am rename to src/lib/libg711/Makefile.am diff --git a/src/libg711/g711.c b/src/lib/libg711/g711.c similarity index 100% rename from src/libg711/g711.c rename to src/lib/libg711/g711.c diff --git a/src/libg711/g711.h b/src/lib/libg711/g711.h similarity index 100% rename from src/libg711/g711.h rename to src/lib/libg711/g711.h diff --git a/src/libgoertzel/Makefile.am b/src/lib/libgoertzel/Makefile.am similarity index 100% rename from src/libgoertzel/Makefile.am rename to src/lib/libgoertzel/Makefile.am diff --git a/src/libgoertzel/goertzel.c b/src/lib/libgoertzel/goertzel.c similarity index 100% rename from src/libgoertzel/goertzel.c rename to src/lib/libgoertzel/goertzel.c diff --git a/src/libgoertzel/goertzel.h b/src/lib/libgoertzel/goertzel.h similarity index 100% rename from src/libgoertzel/goertzel.h rename to src/lib/libgoertzel/goertzel.h diff --git a/src/libhagelbarger/Makefile.am b/src/lib/libhagelbarger/Makefile.am similarity index 100% rename from src/libhagelbarger/Makefile.am rename to src/lib/libhagelbarger/Makefile.am diff --git a/src/libhagelbarger/hagelbarger.c b/src/lib/libhagelbarger/hagelbarger.c similarity index 100% rename from src/libhagelbarger/hagelbarger.c rename to src/lib/libhagelbarger/hagelbarger.c diff --git a/src/libhagelbarger/hagelbarger.h b/src/lib/libhagelbarger/hagelbarger.h similarity index 100% rename from src/libhagelbarger/hagelbarger.h rename to src/lib/libhagelbarger/hagelbarger.h diff --git a/src/libimage/Makefile.am b/src/lib/libimage/Makefile.am similarity index 100% rename from src/libimage/Makefile.am rename to src/lib/libimage/Makefile.am diff --git a/src/libimage/img.c b/src/lib/libimage/img.c similarity index 100% rename from src/libimage/img.c rename to src/lib/libimage/img.c diff --git a/src/libimage/img.h b/src/lib/libimage/img.h similarity index 100% rename from src/libimage/img.h rename to src/lib/libimage/img.h diff --git a/src/libjitter/Makefile.am b/src/lib/libjitter/Makefile.am similarity index 100% rename from src/libjitter/Makefile.am rename to src/lib/libjitter/Makefile.am diff --git a/src/libjitter/jitter.c b/src/lib/libjitter/jitter.c similarity index 100% rename from src/libjitter/jitter.c rename to src/lib/libjitter/jitter.c diff --git a/src/libjitter/jitter.h b/src/lib/libjitter/jitter.h similarity index 100% rename from src/libjitter/jitter.h rename to src/lib/libjitter/jitter.h diff --git a/src/libmobile/Makefile.am b/src/lib/libmobile/Makefile.am similarity index 100% rename from src/libmobile/Makefile.am rename to src/lib/libmobile/Makefile.am diff --git a/src/libmobile/call.c b/src/lib/libmobile/call.c similarity index 100% rename from src/libmobile/call.c rename to src/lib/libmobile/call.c diff --git a/src/libmobile/call.h b/src/lib/libmobile/call.h similarity index 100% rename from src/libmobile/call.h rename to src/lib/libmobile/call.h diff --git a/src/libmobile/cause.c b/src/lib/libmobile/cause.c similarity index 100% rename from src/libmobile/cause.c rename to src/lib/libmobile/cause.c diff --git a/src/libmobile/cause.h b/src/lib/libmobile/cause.h similarity index 100% rename from src/libmobile/cause.h rename to src/lib/libmobile/cause.h diff --git a/src/libmobile/console.c b/src/lib/libmobile/console.c similarity index 100% rename from src/libmobile/console.c rename to src/lib/libmobile/console.c diff --git a/src/libmobile/console.h b/src/lib/libmobile/console.h similarity index 100% rename from src/libmobile/console.h rename to src/lib/libmobile/console.h diff --git a/src/libmobile/main_mobile.c b/src/lib/libmobile/main_mobile.c similarity index 100% rename from src/libmobile/main_mobile.c rename to src/lib/libmobile/main_mobile.c diff --git a/src/libmobile/main_mobile.h b/src/lib/libmobile/main_mobile.h similarity index 100% rename from src/libmobile/main_mobile.h rename to src/lib/libmobile/main_mobile.h diff --git a/src/libmobile/sender.c b/src/lib/libmobile/sender.c similarity index 100% rename from src/libmobile/sender.c rename to src/lib/libmobile/sender.c diff --git a/src/libmobile/sender.h b/src/lib/libmobile/sender.h similarity index 100% rename from src/libmobile/sender.h rename to src/lib/libmobile/sender.h diff --git a/src/libmobile/testton.c b/src/lib/libmobile/testton.c similarity index 100% rename from src/libmobile/testton.c rename to src/lib/libmobile/testton.c diff --git a/src/libmobile/testton.h b/src/lib/libmobile/testton.h similarity index 100% rename from src/libmobile/testton.h rename to src/lib/libmobile/testton.h diff --git a/src/libmtp/Makefile.am b/src/lib/libmtp/Makefile.am similarity index 100% rename from src/libmtp/Makefile.am rename to src/lib/libmtp/Makefile.am diff --git a/src/libmtp/crc16.c b/src/lib/libmtp/crc16.c similarity index 100% rename from src/libmtp/crc16.c rename to src/lib/libmtp/crc16.c diff --git a/src/libmtp/crc16.h b/src/lib/libmtp/crc16.h similarity index 100% rename from src/libmtp/crc16.h rename to src/lib/libmtp/crc16.h diff --git a/src/libmtp/layer2.c b/src/lib/libmtp/layer2.c similarity index 100% rename from src/libmtp/layer2.c rename to src/lib/libmtp/layer2.c diff --git a/src/libmtp/layer3.c b/src/lib/libmtp/layer3.c similarity index 100% rename from src/libmtp/layer3.c rename to src/lib/libmtp/layer3.c diff --git a/src/libmtp/mtp.c b/src/lib/libmtp/mtp.c similarity index 100% rename from src/libmtp/mtp.c rename to src/lib/libmtp/mtp.c diff --git a/src/libmtp/mtp.h b/src/lib/libmtp/mtp.h similarity index 100% rename from src/libmtp/mtp.h rename to src/lib/libmtp/mtp.h diff --git a/src/liboptions/Makefile.am b/src/lib/liboptions/Makefile.am similarity index 100% rename from src/liboptions/Makefile.am rename to src/lib/liboptions/Makefile.am diff --git a/src/liboptions/options.c b/src/lib/liboptions/options.c similarity index 100% rename from src/liboptions/options.c rename to src/lib/liboptions/options.c diff --git a/src/liboptions/options.h b/src/lib/liboptions/options.h similarity index 100% rename from src/liboptions/options.h rename to src/lib/liboptions/options.h diff --git a/src/libosmocc/Makefile.am b/src/lib/libosmocc/Makefile.am similarity index 100% rename from src/libosmocc/Makefile.am rename to src/lib/libosmocc/Makefile.am diff --git a/src/libosmocc/cause.c b/src/lib/libosmocc/cause.c similarity index 100% rename from src/libosmocc/cause.c rename to src/lib/libosmocc/cause.c diff --git a/src/libosmocc/cause.h b/src/lib/libosmocc/cause.h similarity index 100% rename from src/libosmocc/cause.h rename to src/lib/libosmocc/cause.h diff --git a/src/libosmocc/endpoint.c b/src/lib/libosmocc/endpoint.c similarity index 100% rename from src/libosmocc/endpoint.c rename to src/lib/libosmocc/endpoint.c diff --git a/src/libosmocc/endpoint.h b/src/lib/libosmocc/endpoint.h similarity index 100% rename from src/libosmocc/endpoint.h rename to src/lib/libosmocc/endpoint.h diff --git a/src/libosmocc/helper.c b/src/lib/libosmocc/helper.c similarity index 100% rename from src/libosmocc/helper.c rename to src/lib/libosmocc/helper.c diff --git a/src/libosmocc/helper.h b/src/lib/libosmocc/helper.h similarity index 100% rename from src/libosmocc/helper.h rename to src/lib/libosmocc/helper.h diff --git a/src/libosmocc/message.c b/src/lib/libosmocc/message.c similarity index 100% rename from src/libosmocc/message.c rename to src/lib/libosmocc/message.c diff --git a/src/libosmocc/message.h b/src/lib/libosmocc/message.h similarity index 100% rename from src/libosmocc/message.h rename to src/lib/libosmocc/message.h diff --git a/src/libosmocc/rtp.c b/src/lib/libosmocc/rtp.c similarity index 100% rename from src/libosmocc/rtp.c rename to src/lib/libosmocc/rtp.c diff --git a/src/libosmocc/rtp.h b/src/lib/libosmocc/rtp.h similarity index 100% rename from src/libosmocc/rtp.h rename to src/lib/libosmocc/rtp.h diff --git a/src/libosmocc/screen.c b/src/lib/libosmocc/screen.c similarity index 100% rename from src/libosmocc/screen.c rename to src/lib/libosmocc/screen.c diff --git a/src/libosmocc/screen.h b/src/lib/libosmocc/screen.h similarity index 100% rename from src/libosmocc/screen.h rename to src/lib/libosmocc/screen.h diff --git a/src/libosmocc/sdp.c b/src/lib/libosmocc/sdp.c similarity index 100% rename from src/libosmocc/sdp.c rename to src/lib/libosmocc/sdp.c diff --git a/src/libosmocc/sdp.h b/src/lib/libosmocc/sdp.h similarity index 100% rename from src/libosmocc/sdp.h rename to src/lib/libosmocc/sdp.h diff --git a/src/libosmocc/session.c b/src/lib/libosmocc/session.c similarity index 100% rename from src/libosmocc/session.c rename to src/lib/libosmocc/session.c diff --git a/src/libosmocc/session.h b/src/lib/libosmocc/session.h similarity index 100% rename from src/libosmocc/session.h rename to src/lib/libosmocc/session.h diff --git a/src/libosmocc/socket.c b/src/lib/libosmocc/socket.c similarity index 100% rename from src/libosmocc/socket.c rename to src/lib/libosmocc/socket.c diff --git a/src/libosmocc/socket.h b/src/lib/libosmocc/socket.h similarity index 100% rename from src/libosmocc/socket.h rename to src/lib/libosmocc/socket.h diff --git a/src/libsample/Makefile.am b/src/lib/libsample/Makefile.am similarity index 100% rename from src/libsample/Makefile.am rename to src/lib/libsample/Makefile.am diff --git a/src/libsample/sample.c b/src/lib/libsample/sample.c similarity index 100% rename from src/libsample/sample.c rename to src/lib/libsample/sample.c diff --git a/src/libsample/sample.h b/src/lib/libsample/sample.h similarity index 100% rename from src/libsample/sample.h rename to src/lib/libsample/sample.h diff --git a/src/libsamplerate/Makefile.am b/src/lib/libsamplerate/Makefile.am similarity index 100% rename from src/libsamplerate/Makefile.am rename to src/lib/libsamplerate/Makefile.am diff --git a/src/libsamplerate/samplerate.c b/src/lib/libsamplerate/samplerate.c similarity index 100% rename from src/libsamplerate/samplerate.c rename to src/lib/libsamplerate/samplerate.c diff --git a/src/libsamplerate/samplerate.h b/src/lib/libsamplerate/samplerate.h similarity index 100% rename from src/libsamplerate/samplerate.h rename to src/lib/libsamplerate/samplerate.h diff --git a/src/libscrambler/Makefile.am b/src/lib/libscrambler/Makefile.am similarity index 100% rename from src/libscrambler/Makefile.am rename to src/lib/libscrambler/Makefile.am diff --git a/src/libscrambler/scrambler.c b/src/lib/libscrambler/scrambler.c similarity index 100% rename from src/libscrambler/scrambler.c rename to src/lib/libscrambler/scrambler.c diff --git a/src/libscrambler/scrambler.h b/src/lib/libscrambler/scrambler.h similarity index 100% rename from src/libscrambler/scrambler.h rename to src/lib/libscrambler/scrambler.h diff --git a/src/libsdr/Makefile.am b/src/lib/libsdr/Makefile.am similarity index 100% rename from src/libsdr/Makefile.am rename to src/lib/libsdr/Makefile.am diff --git a/src/libsdr/sdr.c b/src/lib/libsdr/sdr.c similarity index 100% rename from src/libsdr/sdr.c rename to src/lib/libsdr/sdr.c diff --git a/src/libsdr/sdr.h b/src/lib/libsdr/sdr.h similarity index 100% rename from src/libsdr/sdr.h rename to src/lib/libsdr/sdr.h diff --git a/src/libsdr/sdr_config.c b/src/lib/libsdr/sdr_config.c similarity index 100% rename from src/libsdr/sdr_config.c rename to src/lib/libsdr/sdr_config.c diff --git a/src/libsdr/sdr_config.h b/src/lib/libsdr/sdr_config.h similarity index 100% rename from src/libsdr/sdr_config.h rename to src/lib/libsdr/sdr_config.h diff --git a/src/libsdr/soapy.c b/src/lib/libsdr/soapy.c similarity index 100% rename from src/libsdr/soapy.c rename to src/lib/libsdr/soapy.c diff --git a/src/libsdr/soapy.h b/src/lib/libsdr/soapy.h similarity index 100% rename from src/libsdr/soapy.h rename to src/lib/libsdr/soapy.h diff --git a/src/libsdr/uhd.c b/src/lib/libsdr/uhd.c similarity index 100% rename from src/libsdr/uhd.c rename to src/lib/libsdr/uhd.c diff --git a/src/libsdr/uhd.h b/src/lib/libsdr/uhd.h similarity index 100% rename from src/libsdr/uhd.h rename to src/lib/libsdr/uhd.h diff --git a/src/libsendevolumenregler/Makefile.am b/src/lib/libsendevolumenregler/Makefile.am similarity index 100% rename from src/libsendevolumenregler/Makefile.am rename to src/lib/libsendevolumenregler/Makefile.am diff --git a/src/libsendevolumenregler/sendevolumenregler.c b/src/lib/libsendevolumenregler/sendevolumenregler.c similarity index 100% rename from src/libsendevolumenregler/sendevolumenregler.c rename to src/lib/libsendevolumenregler/sendevolumenregler.c diff --git a/src/libsendevolumenregler/sendevolumenregler.h b/src/lib/libsendevolumenregler/sendevolumenregler.h similarity index 100% rename from src/libsendevolumenregler/sendevolumenregler.h rename to src/lib/libsendevolumenregler/sendevolumenregler.h diff --git a/src/libserial/Makefile.am b/src/lib/libserial/Makefile.am similarity index 100% rename from src/libserial/Makefile.am rename to src/lib/libserial/Makefile.am diff --git a/src/libserial/serial.c b/src/lib/libserial/serial.c similarity index 100% rename from src/libserial/serial.c rename to src/lib/libserial/serial.c diff --git a/src/libserial/serial.h b/src/lib/libserial/serial.h similarity index 100% rename from src/libserial/serial.h rename to src/lib/libserial/serial.h diff --git a/src/libsound/Makefile.am b/src/lib/libsound/Makefile.am similarity index 100% rename from src/libsound/Makefile.am rename to src/lib/libsound/Makefile.am diff --git a/src/libsound/sound.h b/src/lib/libsound/sound.h similarity index 100% rename from src/libsound/sound.h rename to src/lib/libsound/sound.h diff --git a/src/libsound/sound_alsa.c b/src/lib/libsound/sound_alsa.c similarity index 100% rename from src/libsound/sound_alsa.c rename to src/lib/libsound/sound_alsa.c diff --git a/src/libsquelch/Makefile.am b/src/lib/libsquelch/Makefile.am similarity index 100% rename from src/libsquelch/Makefile.am rename to src/lib/libsquelch/Makefile.am diff --git a/src/libsquelch/squelch.c b/src/lib/libsquelch/squelch.c similarity index 100% rename from src/libsquelch/squelch.c rename to src/lib/libsquelch/squelch.c diff --git a/src/libsquelch/squelch.h b/src/lib/libsquelch/squelch.h similarity index 100% rename from src/libsquelch/squelch.h rename to src/lib/libsquelch/squelch.h diff --git a/src/libtimer/Makefile.am b/src/lib/libtimer/Makefile.am similarity index 100% rename from src/libtimer/Makefile.am rename to src/lib/libtimer/Makefile.am diff --git a/src/libtimer/timer.c b/src/lib/libtimer/timer.c similarity index 100% rename from src/libtimer/timer.c rename to src/lib/libtimer/timer.c diff --git a/src/libtimer/timer.h b/src/lib/libtimer/timer.h similarity index 100% rename from src/libtimer/timer.h rename to src/lib/libtimer/timer.h diff --git a/src/libv27/Makefile.am b/src/lib/libv27/Makefile.am similarity index 100% rename from src/libv27/Makefile.am rename to src/lib/libv27/Makefile.am diff --git a/src/libv27/modem.c b/src/lib/libv27/modem.c similarity index 100% rename from src/libv27/modem.c rename to src/lib/libv27/modem.c diff --git a/src/libv27/modem.h b/src/lib/libv27/modem.h similarity index 100% rename from src/libv27/modem.h rename to src/lib/libv27/modem.h diff --git a/src/libv27/psk.c b/src/lib/libv27/psk.c similarity index 100% rename from src/libv27/psk.c rename to src/lib/libv27/psk.c diff --git a/src/libv27/psk.h b/src/lib/libv27/psk.h similarity index 100% rename from src/libv27/psk.h rename to src/lib/libv27/psk.h diff --git a/src/libv27/scrambler.c b/src/lib/libv27/scrambler.c similarity index 100% rename from src/libv27/scrambler.c rename to src/lib/libv27/scrambler.c diff --git a/src/libv27/scrambler.h b/src/lib/libv27/scrambler.h similarity index 100% rename from src/libv27/scrambler.h rename to src/lib/libv27/scrambler.h diff --git a/src/libwave/Makefile.am b/src/lib/libwave/Makefile.am similarity index 100% rename from src/libwave/Makefile.am rename to src/lib/libwave/Makefile.am diff --git a/src/libwave/wave.c b/src/lib/libwave/wave.c similarity index 100% rename from src/libwave/wave.c rename to src/lib/libwave/wave.c diff --git a/src/libwave/wave.h b/src/lib/libwave/wave.h similarity index 100% rename from src/libwave/wave.h rename to src/lib/libwave/wave.h diff --git a/src/magnetic/Makefile.am b/src/magnetic/Makefile.am index f5e9f83a..ac568de4 100644 --- a/src/magnetic/Makefile.am +++ b/src/magnetic/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ cnetz_magnetic @@ -10,15 +10,15 @@ cnetz_magnetic_SOURCES = \ cnetz_magnetic_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libwave/libwave.a \ - $(top_builddir)/src/libaaimage/libaaimage.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA cnetz_magnetic_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif diff --git a/src/magnetic/main.c b/src/magnetic/main.c index 2d322319..77e252d3 100644 --- a/src/magnetic/main.c +++ b/src/magnetic/main.c @@ -26,12 +26,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libsound/sound.h" -#include "../libwave/wave.h" -#include "../libdebug/debug.h" -#include "../liboptions/options.h" -#include "../libaaimage/aaimage.h" +#include +#include +#include +#include +#include +#include #include "iso7811.h" int num_kanal = 1; diff --git a/src/mpt1327/Makefile.am b/src/mpt1327/Makefile.am index 49ec2c61..2df13ed1 100644 --- a/src/mpt1327/Makefile.am +++ b/src/mpt1327/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ mpt1327 @@ -11,37 +11,37 @@ mpt1327_SOURCES = \ mpt1327_LDADD = \ $(COMMON_LA) \ ../anetz/libgermanton.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libsquelch/libsquelch.a \ - $(top_builddir)/src/libdtmf/libdtmf.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfsk/libfsk.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libsquelch/libsquelch.a \ + $(top_builddir)/src/lib/libdtmf/libdtmf.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfsk/libfsk.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA mpt1327_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR mpt1327_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/mpt1327/dsp.c b/src/mpt1327/dsp.c index 4b6b7dc9..3081add6 100644 --- a/src/mpt1327/dsp.c +++ b/src/mpt1327/dsp.c @@ -25,10 +25,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/call.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" +#include +#include +#include +#include #include "mpt1327.h" #include "dsp.h" #include "message.h" diff --git a/src/mpt1327/main.c b/src/mpt1327/main.c index 13393c18..0ab2d5fa 100644 --- a/src/mpt1327/main.c +++ b/src/mpt1327/main.c @@ -27,13 +27,13 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/main_mobile.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" +#include +#include +#include +#include #include "../anetz/freiton.h" #include "../anetz/besetztton.h" -#include "../liboptions/options.h" +#include #include "mpt1327.h" #include "dsp.h" #include "message.h" diff --git a/src/mpt1327/message.c b/src/mpt1327/message.c index c8505943..42ba6f09 100644 --- a/src/mpt1327/message.c +++ b/src/mpt1327/message.c @@ -23,7 +23,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #include "message.h" static struct mpt1327_parameter_names { diff --git a/src/mpt1327/mpt1327.c b/src/mpt1327/mpt1327.c index d87d476b..84653d92 100755 --- a/src/mpt1327/mpt1327.c +++ b/src/mpt1327/mpt1327.c @@ -70,12 +70,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libtimer/timer.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include +#include #include "mpt1327.h" #include "dsp.h" #include "message.h" diff --git a/src/mpt1327/mpt1327.h b/src/mpt1327/mpt1327.h index 18af5e1d..022b7310 100755 --- a/src/mpt1327/mpt1327.h +++ b/src/mpt1327/mpt1327.h @@ -1,6 +1,6 @@ -#include "../libsquelch/squelch.h" -#include "../libfsk/fsk.h" -#include "../libmobile/sender.h" +#include +#include +#include enum mpt1327_band { BAND_MPT1343_SUB1 = 0, diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am index 58874556..f4f96ae9 100644 --- a/src/nmt/Makefile.am +++ b/src/nmt/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib noinst_LIBRARIES = libdmssms.a @@ -22,39 +22,39 @@ nmt_SOURCES = \ nmt_LDADD = \ $(COMMON_LA) \ libdmssms.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.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/libhagelbarger/libhagelbarger.a \ - $(top_builddir)/src/libdtmf/libdtmf.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfsk/libfsk.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libgoertzel/libgoertzel.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libhagelbarger/libhagelbarger.a \ + $(top_builddir)/src/lib/libdtmf/libdtmf.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfsk/libfsk.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA nmt_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR nmt_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/nmt/dms.c b/src/nmt/dms.c index 82d51745..b7b3cce7 100644 --- a/src/nmt/dms.c +++ b/src/nmt/dms.c @@ -21,8 +21,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #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 627c1203..910c79dc 100644 --- a/src/nmt/dsp.c +++ b/src/nmt/dsp.c @@ -25,8 +25,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "nmt.h" #include "transaction.h" #include "dsp.h" diff --git a/src/nmt/frame.c b/src/nmt/frame.c index 21e1b337..48af208f 100644 --- a/src/nmt/frame.c +++ b/src/nmt/frame.c @@ -22,9 +22,9 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libhagelbarger/hagelbarger.h" +#include +#include +#include #include "nmt.h" #include "frame.h" diff --git a/src/nmt/main.c b/src/nmt/main.c index ea03c518..12dc15f3 100644 --- a/src/nmt/main.c +++ b/src/nmt/main.c @@ -26,10 +26,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/main_mobile.h" -#include "../libdebug/debug.h" -#include "../liboptions/options.h" +#include +#include +#include +#include #include "nmt.h" #include "frame.h" #include "dsp.h" diff --git a/src/nmt/nmt.c b/src/nmt/nmt.c index 5385593d..966d80b5 100644 --- a/src/nmt/nmt.c +++ b/src/nmt/nmt.c @@ -25,10 +25,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include #include "nmt.h" #include "transaction.h" #include "dsp.h" diff --git a/src/nmt/nmt.h b/src/nmt/nmt.h index 06d0629b..3931fde0 100644 --- a/src/nmt/nmt.h +++ b/src/nmt/nmt.h @@ -1,10 +1,10 @@ -#include "../libmobile/sender.h" -#include "../libtimer/timer.h" -#include "../libcompandor/compandor.h" -#include "../libdtmf/dtmf_encode.h" -#include "../libmobile/call.h" -#include "../libfsk/fsk.h" -#include "../libgoertzel/goertzel.h" +#include +#include +#include +#include +#include +#include +#include typedef struct nmt nmt_t; #include "dms.h" #include "sms.h" diff --git a/src/nmt/sms.c b/src/nmt/sms.c index 87af10a0..47f6f048 100644 --- a/src/nmt/sms.c +++ b/src/nmt/sms.c @@ -23,8 +23,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "nmt.h" #define SMS_RECEIVE_TO 5.0 diff --git a/src/nmt/transaction.c b/src/nmt/transaction.c index 39aed2fb..236fd890 100644 --- a/src/nmt/transaction.c +++ b/src/nmt/transaction.c @@ -21,8 +21,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "nmt.h" #include "transaction.h" diff --git a/src/pocsag/Makefile.am b/src/pocsag/Makefile.am index 817a95b9..b4a41b3d 100644 --- a/src/pocsag/Makefile.am +++ b/src/pocsag/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ pocsag @@ -12,35 +12,35 @@ pocsag_SOURCES = \ pocsag_LDADD = \ $(COMMON_LA) \ ../anetz/libgermanton.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA pocsag_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR pocsag_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/pocsag/dsp.c b/src/pocsag/dsp.c index af1a80ba..7f177aed 100644 --- a/src/pocsag/dsp.c +++ b/src/pocsag/dsp.c @@ -25,8 +25,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "pocsag.h" #include "frame.h" #include "dsp.h" diff --git a/src/pocsag/frame.c b/src/pocsag/frame.c index 12ccd100..7f1b8d65 100644 --- a/src/pocsag/frame.c +++ b/src/pocsag/frame.c @@ -22,8 +22,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "pocsag.h" #include "frame.h" diff --git a/src/pocsag/main.c b/src/pocsag/main.c index 24d50d50..03d709e7 100644 --- a/src/pocsag/main.c +++ b/src/pocsag/main.c @@ -26,12 +26,12 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/main_mobile.h" -#include "../liboptions/options.h" -#include "../libfm/fm.h" +#include +#include +#include +#include +#include +#include #include "../anetz/besetztton.h" #include "pocsag.h" #include "dsp.h" diff --git a/src/pocsag/pocsag.c b/src/pocsag/pocsag.c index d7ca70f8..95546896 100644 --- a/src/pocsag/pocsag.c +++ b/src/pocsag/pocsag.c @@ -27,11 +27,11 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include +#include #include "pocsag.h" #include "frame.h" #include "dsp.h" diff --git a/src/pocsag/pocsag.h b/src/pocsag/pocsag.h index 2ebadd8c..dafcf85d 100644 --- a/src/pocsag/pocsag.h +++ b/src/pocsag/pocsag.h @@ -1,4 +1,4 @@ -#include "../libmobile/sender.h" +#include enum pocsag_function { POCSAG_FUNCTION_NUMERIC = 0, diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am index c3d7cfb2..035dcc16 100644 --- a/src/r2000/Makefile.am +++ b/src/r2000/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ radiocom2000 @@ -12,37 +12,37 @@ radiocom2000_SOURCES = \ main.c radiocom2000_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.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/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfsk/libfsk.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libhagelbarger/libhagelbarger.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfsk/libfsk.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA radiocom2000_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR radiocom2000_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/r2000/dsp.c b/src/r2000/dsp.c index 4d28685f..2d3368b6 100644 --- a/src/r2000/dsp.c +++ b/src/r2000/dsp.c @@ -25,8 +25,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "r2000.h" #include "dsp.h" diff --git a/src/r2000/frame.c b/src/r2000/frame.c index b2310415..2b7a40f5 100644 --- a/src/r2000/frame.c +++ b/src/r2000/frame.c @@ -23,8 +23,8 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../libhagelbarger/hagelbarger.h" +#include +#include #include "frame.h" static const char *param_hex(uint64_t value) diff --git a/src/r2000/main.c b/src/r2000/main.c index 5aed476e..4ad2863e 100644 --- a/src/r2000/main.c +++ b/src/r2000/main.c @@ -26,10 +26,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libmobile/main_mobile.h" -#include "../libdebug/debug.h" -#include "../liboptions/options.h" +#include +#include +#include +#include #include "r2000.h" #include "dsp.h" #include "frame.h" diff --git a/src/r2000/r2000.c b/src/r2000/r2000.c index 1b3013f3..528e23b6 100644 --- a/src/r2000/r2000.c +++ b/src/r2000/r2000.c @@ -25,10 +25,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/cause.h" -#include "../libosmocc/message.h" +#include +#include +#include +#include #include "r2000.h" //#include "transaction.h" #include "frame.h" diff --git a/src/r2000/r2000.h b/src/r2000/r2000.h index 07d7c1b2..70d9a768 100644 --- a/src/r2000/r2000.h +++ b/src/r2000/r2000.h @@ -1,8 +1,8 @@ -#include "../libcompandor/compandor.h" -#include "../libtimer/timer.h" -#include "../libmobile/sender.h" -#include "../libmobile/call.h" -#include "../libfsk/fsk.h" +#include +#include +#include +#include +#include enum dsp_mode { DSP_MODE_OFF, /* no transmission */ diff --git a/src/radio/Makefile.am b/src/radio/Makefile.am index a96e3bbe..6c134bce 100644 --- a/src/radio/Makefile.am +++ b/src/radio/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib if HAVE_SDR @@ -10,28 +10,28 @@ osmoradio_SOURCES = \ main.c osmoradio_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libwave/libwave.a \ - $(top_builddir)/src/libsample/libsample.a \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libclipper/libclipper.a \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libfilter/libfilter.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libfft/libfft.a \ - $(top_builddir)/src/libtimer/libtimer.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libclipper/libclipper.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ -lm if HAVE_ALSA osmoradio_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif diff --git a/src/radio/main.c b/src/radio/main.c index b58108f4..bff08966 100644 --- a/src/radio/main.c +++ b/src/radio/main.c @@ -30,11 +30,11 @@ enum paging_signal; #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libsdr/sdr_config.h" -#include "../libsdr/sdr.h" -#include "../liboptions/options.h" +#include +#include +#include +#include +#include #include "radio.h" #define DEFAULT_LO_OFFSET -1000000.0 diff --git a/src/radio/radio.c b/src/radio/radio.c index 53546223..df47700c 100644 --- a/src/radio/radio.c +++ b/src/radio/radio.c @@ -24,10 +24,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libsound/sound.h" -#include "../libclipper/clipper.h" +#include +#include +#include +#include #include "radio.h" #define CLIP_POINT 0.85 diff --git a/src/radio/radio.h b/src/radio/radio.h index 35c36ee1..8cc266d2 100644 --- a/src/radio/radio.h +++ b/src/radio/radio.h @@ -1,11 +1,11 @@ -#include "../libwave/wave.h" -#include "../libsamplerate/samplerate.h" -#include "../libemphasis/emphasis.h" -#include "../libjitter/jitter.h" -#include "../libfm/fm.h" -#include "../libam/am.h" -#include "../libdisplay/display.h" +#include +#include +#include +#include +#include +#include +#include enum modulation { MODULATION_NONE = 0, diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 975de706..6fc7a1a2 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ cnetz_sim @@ -11,9 +11,9 @@ cnetz_sim_SOURCES = \ cnetz_sim_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libserial/libserial.a \ - $(top_builddir)/src/libaaimage/libaaimage.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libserial/libserial.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm diff --git a/src/sim/main.c b/src/sim/main.c index fc7a7efd..62d9aee2 100644 --- a/src/sim/main.c +++ b/src/sim/main.c @@ -30,10 +30,10 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../liboptions/options.h" -#include "../libserial/serial.h" -#include "../libaaimage/aaimage.h" +#include +#include +#include +#include #include "sim.h" #include "sniffer.h" #include "eeprom.h" diff --git a/src/sim/sim.c b/src/sim/sim.c index baadb4f9..24ae5ba1 100644 --- a/src/sim/sim.c +++ b/src/sim/sim.c @@ -23,7 +23,7 @@ #include #include #ifndef ARDUINO -#include "../libdebug/debug.h" +#include #endif #include "sim.h" #include "eeprom.h" diff --git a/src/sim/sniffer.c b/src/sim/sniffer.c index 34a2e4ca..76aaf42b 100644 --- a/src/sim/sniffer.c +++ b/src/sim/sniffer.c @@ -22,7 +22,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #include "sim.h" #include "sniffer.h" diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am index cc37f1de..69dfd884 100644 --- a/src/tacs/Makefile.am +++ b/src/tacs/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ tacs @@ -13,36 +13,36 @@ tacs_SOURCES = \ tacs_LDADD = \ $(COMMON_LA) \ ../amps/libamps.a \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.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/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libgoertzel/libgoertzel.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA tacs_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR tacs_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/test/Makefile.am b/src/test/Makefile.am index befadcd1..f485c3ca 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -g $(all_includes) +AM_CPPFLAGS = -Wall -g $(all_includes) -I../lib noinst_PROGRAMS = \ test_filter \ @@ -17,77 +17,77 @@ 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/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ -lm test_sendevolumenregler_SOURCES = test_sendevolumenregler.c test_sendevolumenregler_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libsendevolumenregler/libsendevolumenregler.a \ + $(top_builddir)/src/lib/libsendevolumenregler/libsendevolumenregler.a \ -lm test_compandor_SOURCES = dummy.c test_compandor.c test_compandor_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libcompandor/libcompandor.a \ + $(top_builddir)/src/lib/libcompandor/libcompandor.a \ -lm 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/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ -lm test_dtmf_SOURCES = dummy.c test_dtmf.c test_dtmf_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libdtmf/libdtmf.a \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libdtmf/libdtmf.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ -lm 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/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ $(top_builddir)/src/nmt/libdmssms.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.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/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA test_dms_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR test_dms_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libfft/libfft.a \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libam/libam.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libam/libam.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif @@ -96,35 +96,35 @@ 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/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ $(top_builddir)/src/nmt/libdmssms.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.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/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ -lm if HAVE_ALSA test_sms_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR test_sms_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libfft/libfft.a \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libam/libam.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libam/libam.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif @@ -133,30 +133,30 @@ test_performance_SOURCES = dummy.c test_performance.c test_performance_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ -lm test_hagelbarger_SOURCES = dummy.c test_hagelbarger.c test_hagelbarger_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libhagelbarger/libhagelbarger.a \ + $(top_builddir)/src/lib/libhagelbarger/libhagelbarger.a \ -lm test_v27scrambler_SOURCES = dummy.c test_v27scrambler.c test_v27scrambler_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/libv27/libv27.a \ + $(top_builddir)/src/lib/libv27/libv27.a \ -lm 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/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libgoertzel/libgoertzel.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ -lm diff --git a/src/test/test_compandor.c b/src/test/test_compandor.c index b1cd51e9..81e162bb 100644 --- a/src/test/test_compandor.c +++ b/src/test/test_compandor.c @@ -2,8 +2,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libcompandor/compandor.h" +#include +#include #define level2db(level) (20 * log10(level)) #define db2level(db) pow(10, (double)db / 20.0) diff --git a/src/test/test_dms.c b/src/test/test_dms.c index 23a91dbc..13fc0c49 100644 --- a/src/test/test_dms.c +++ b/src/test/test_dms.c @@ -4,8 +4,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "../nmt/nmt.h" extern int dms_allow_loopback; diff --git a/src/test/test_dtmf.c b/src/test/test_dtmf.c index 6640c597..eb1c80b2 100644 --- a/src/test/test_dtmf.c +++ b/src/test/test_dtmf.c @@ -2,10 +2,10 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../libsample/sample.h" -#include "../libdtmf/dtmf_decode.h" -#include "../libdtmf/dtmf_encode.h" +#include +#include +#include +#include #define level2db(level) (20 * log10(level)) #define db2level(db) pow(10, (double)db / 20.0) diff --git a/src/test/test_emphasis.c b/src/test/test_emphasis.c index aea63561..5d780e0e 100644 --- a/src/test/test_emphasis.c +++ b/src/test/test_emphasis.c @@ -2,10 +2,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libfilter/iir_filter.h" -#include "../libemphasis/emphasis.h" -#include "../libdebug/debug.h" +#include +#include +#include +#include #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 3011930d..e71b6122 100644 --- a/src/test/test_filter.c +++ b/src/test/test_filter.c @@ -2,10 +2,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libfilter/iir_filter.h" -#include "../libfilter/fir_filter.h" -#include "../libdebug/debug.h" +#include +#include +#include +#include #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 ee1ba0f4..e1c1e385 100644 --- a/src/test/test_goertzel.c +++ b/src/test/test_goertzel.c @@ -2,9 +2,9 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libgoertzel/goertzel.h" -#include "../libdebug/debug.h" +#include +#include +#include #define level2db(level) (20 * log10(level)) #define db2level(db) pow(10, (double)db / 20.0) diff --git a/src/test/test_hagelbarger.c b/src/test/test_hagelbarger.c index c2a99371..3e1769a1 100644 --- a/src/test/test_hagelbarger.c +++ b/src/test/test_hagelbarger.c @@ -1,7 +1,7 @@ #include "stdio.h" #include "stdint.h" #include "string.h" -#include "../libhagelbarger/hagelbarger.h" +#include int main(void) { diff --git a/src/test/test_performance.c b/src/test/test_performance.c index a045eee0..2e16c800 100644 --- a/src/test/test_performance.c +++ b/src/test/test_performance.c @@ -3,10 +3,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libfilter/iir_filter.h" -#include "../libfm/fm.h" -#include "../libdebug/debug.h" +#include +#include +#include +#include struct timeval start_tv, tv; double duration; diff --git a/src/test/test_sendevolumenregler.c b/src/test/test_sendevolumenregler.c index 29ec8131..391a205b 100644 --- a/src/test/test_sendevolumenregler.c +++ b/src/test/test_sendevolumenregler.c @@ -2,8 +2,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libsendevolumenregler/sendevolumenregler.h" +#include +#include #define level2db(level) (20 * log10(level)) #define db2level(db) pow(10, (double)db / 20.0) diff --git a/src/test/test_sms.c b/src/test/test_sms.c index 36c892b1..46f767d8 100644 --- a/src/test/test_sms.c +++ b/src/test/test_sms.c @@ -4,8 +4,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" +#include +#include #include "../nmt/nmt.h" static const uint8_t test_mo_sms_data1[] = { diff --git a/src/test/test_v27scrambler.c b/src/test/test_v27scrambler.c index 7ce9fc7d..2aac3b08 100644 --- a/src/test/test_v27scrambler.c +++ b/src/test/test_v27scrambler.c @@ -1,7 +1,7 @@ #include "stdio.h" #include "stdint.h" #include "string.h" -#include "../libv27/scrambler.h" +#include static int show_bin(uint8_t *data1, uint8_t *data2, int len) { diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am index 7fe03b86..f966de7e 100644 --- a/src/tv/Makefile.am +++ b/src/tv/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(IMAGEMAGICK_CFLAGS) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(IMAGEMAGICK_CFLAGS) -I../lib bin_PROGRAMS = \ osmotv @@ -18,30 +18,30 @@ osmotv_SOURCES = \ main.c osmotv_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libimage/libimage.a \ - $(top_builddir)/src/libfm/libfm.a \ - $(top_builddir)/src/libfilter/libfilter.a \ - $(top_builddir)/src/libwave/libwave.a \ - $(top_builddir)/src/libsample/libsample.a \ + $(top_builddir)/src/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libimage/libimage.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ $(ALSA_LIBS) \ $(IMAGEMAGICK_LIBS) \ -lm if HAVE_SDR osmotv_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a endif osmotv_LDADD += \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libtimer/libtimer.a + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a if HAVE_SDR osmotv_LDADD += \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/tv/bas.c b/src/tv/bas.c index 55ffa58f..97a64078 100644 --- a/src/tv/bas.c +++ b/src/tv/bas.c @@ -20,8 +20,8 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libfilter/iir_filter.h" +#include +#include #include "bas.h" #include "vcr.h" #include "fubk.h" diff --git a/src/tv/color.c b/src/tv/color.c index 0a0e8c70..6706a9ed 100644 --- a/src/tv/color.c +++ b/src/tv/color.c @@ -20,7 +20,7 @@ #include #include #include -#include "../libsample/sample.h" +#include #include "color.h" #define RAMP_WIDTH 0.0000002 diff --git a/src/tv/convergence.c b/src/tv/convergence.c index ee74d247..394ed5a1 100644 --- a/src/tv/convergence.c +++ b/src/tv/convergence.c @@ -20,7 +20,7 @@ #include #include #include -#include "../libsample/sample.h" +#include #include "convergence.h" #define GRID_LINES (4 * thick) diff --git a/src/tv/ebu.c b/src/tv/ebu.c index d3afa743..9d438ca0 100644 --- a/src/tv/ebu.c +++ b/src/tv/ebu.c @@ -20,7 +20,7 @@ #include #include #include -#include "../libsample/sample.h" +#include #include "ebu.h" #define RAMP_WIDTH 0.0000002 diff --git a/src/tv/fubk.c b/src/tv/fubk.c index f85a01b8..898d068d 100644 --- a/src/tv/fubk.c +++ b/src/tv/fubk.c @@ -20,7 +20,7 @@ #include #include #include -#include "../libsample/sample.h" +#include #include "fubk.h" #include "font.h" diff --git a/src/tv/image.c b/src/tv/image.c index b2dcc456..b2f1b8ad 100644 --- a/src/tv/image.c +++ b/src/tv/image.c @@ -19,7 +19,7 @@ #include #include -#include "../libsample/sample.h" +#include #include "image.h" /* render image line starting with x and end with LINE_LENGTH diff --git a/src/tv/main.c b/src/tv/main.c index c46b9d6e..c3ed860d 100644 --- a/src/tv/main.c +++ b/src/tv/main.c @@ -28,17 +28,17 @@ enum paging_signal; #include #include #include -#include "../libsample/sample.h" -#include "../libfilter/iir_filter.h" -#include "../libfm/fm.h" -#include "../libwave/wave.h" -#include "../libimage/img.h" -#include "../libdebug/debug.h" +#include +#include +#include +#include +#include +#include #ifdef HAVE_SDR -#include "../libsdr/sdr_config.h" -#include "../libsdr/sdr.h" +#include +#include #endif -#include "../liboptions/options.h" +#include #include "bas.h" #include "tv_modulate.h" #include "channels.h" diff --git a/src/tv/tv_modulate.c b/src/tv/tv_modulate.c index f6850a5d..8a8955fc 100644 --- a/src/tv/tv_modulate.c +++ b/src/tv/tv_modulate.c @@ -19,7 +19,7 @@ #include #include -#include "../libsample/sample.h" +#include #include "tv_modulate.h" #define WHITE_MODULATION 0.1 diff --git a/src/tv/vcr.c b/src/tv/vcr.c index a27460d6..32dc59cc 100644 --- a/src/tv/vcr.c +++ b/src/tv/vcr.c @@ -20,7 +20,7 @@ #include #include #include -#include "../libsample/sample.h" +#include #include "vcr.h" /* test ID of calibration part: diff --git a/src/zeitansage/Makefile.am b/src/zeitansage/Makefile.am index dbab2fbb..d93e59a2 100644 --- a/src/zeitansage/Makefile.am +++ b/src/zeitansage/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(FUSE_CFLAGS) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(FUSE_CFLAGS) -I../lib bin_PROGRAMS = \ zeitansage @@ -10,36 +10,36 @@ zeitansage_SOURCES = \ main.c zeitansage_LDADD = \ $(COMMON_LA) \ - $(top_builddir)/src/liboptions/liboptions.a \ - $(top_builddir)/src/libdebug/libdebug.a \ - $(top_builddir)/src/libmobile/libmobile.a \ - $(top_builddir)/src/libosmocc/libosmocc.a \ - $(top_builddir)/src/libdisplay/libdisplay.a \ - $(top_builddir)/src/libjitter/libjitter.a \ - $(top_builddir)/src/libtimer/libtimer.a \ - $(top_builddir)/src/libsamplerate/libsamplerate.a \ - $(top_builddir)/src/libemphasis/libemphasis.a \ - $(top_builddir)/src/libfsk/libfsk.a \ - $(top_builddir)/src/libfm/libfm.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/lib/liboptions/liboptions.a \ + $(top_builddir)/src/lib/libdebug/libdebug.a \ + $(top_builddir)/src/lib/libmobile/libmobile.a \ + $(top_builddir)/src/lib/libosmocc/libosmocc.a \ + $(top_builddir)/src/lib/libdisplay/libdisplay.a \ + $(top_builddir)/src/lib/libjitter/libjitter.a \ + $(top_builddir)/src/lib/libtimer/libtimer.a \ + $(top_builddir)/src/lib/libsamplerate/libsamplerate.a \ + $(top_builddir)/src/lib/libemphasis/libemphasis.a \ + $(top_builddir)/src/lib/libfsk/libfsk.a \ + $(top_builddir)/src/lib/libfm/libfm.a \ + $(top_builddir)/src/lib/libfilter/libfilter.a \ + $(top_builddir)/src/lib/libwave/libwave.a \ + $(top_builddir)/src/lib/libsample/libsample.a \ + $(top_builddir)/src/lib/libg711/libg711.a \ + $(top_builddir)/src/lib/libaaimage/libaaimage.a \ $(ALSA_LIBS) \ -lm if HAVE_ALSA zeitansage_LDADD += \ - $(top_builddir)/src/libsound/libsound.a \ + $(top_builddir)/src/lib/libsound/libsound.a \ $(ALSA_LIBS) endif if HAVE_SDR zeitansage_LDADD += \ - $(top_builddir)/src/libsdr/libsdr.a \ - $(top_builddir)/src/libam/libam.a \ - $(top_builddir)/src/libfft/libfft.a \ + $(top_builddir)/src/lib/libsdr/libsdr.a \ + $(top_builddir)/src/lib/libam/libam.a \ + $(top_builddir)/src/lib/libfft/libfft.a \ $(UHD_LIBS) \ $(SOAPY_LIBS) endif diff --git a/src/zeitansage/main.c b/src/zeitansage/main.c index 7112f7fc..5a25ae69 100644 --- a/src/zeitansage/main.c +++ b/src/zeitansage/main.c @@ -22,11 +22,11 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/main_mobile.h" -#include "../liboptions/options.h" +#include +#include +#include +#include +#include #include "zeitansage.h" #include "samples.h" diff --git a/src/zeitansage/zeitansage.c b/src/zeitansage/zeitansage.c index 835e5aff..75eb0785 100644 --- a/src/zeitansage/zeitansage.c +++ b/src/zeitansage/zeitansage.c @@ -24,10 +24,10 @@ #include #include #include -#include "../libsample/sample.h" -#include "../libdebug/debug.h" -#include "../libmobile/call.h" -#include "../libmobile/cause.h" +#include +#include +#include +#include #include "zeitansage.h" #define db2level(db) pow(10, (double)(db) / 20.0) diff --git a/src/zeitansage/zeitansage.h b/src/zeitansage/zeitansage.h index 64dd986b..88a59611 100644 --- a/src/zeitansage/zeitansage.h +++ b/src/zeitansage/zeitansage.h @@ -1,6 +1,6 @@ -#include "../libfm/fm.h" -#include "../libmobile/sender.h" -#include "../libtimer/timer.h" +#include +#include +#include /* current state of incoming call */ enum zeit_call_state {