re-structure directory tree in preparation of submodules

This moves src/lib* to src/lib/lib* so that we can move src/lib
into a submodule in a subsequent commit

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

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
 

extra/main.c

@@ -22,8 +22,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <../src/libdebug/debug.h>
-#include <../src/liboptions/options.h>
+#include <libdebug/debug.h>
+#include <liboptions/options.h>
 
 int num_kanal = 1;
 static uint8_t magic1 = 0x1e;

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 += \

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

src/amps/amps.c

@@ -42,11 +42,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/cause.h"
-#include "../libosmocc/message.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
+#include <libosmocc/message.h>
 #include "amps.h"
 #include "dsp.h"
 #include "frame.h"

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 <libgoertzel/goertzel.h>
+#include <libmobile/sender.h>
+#include <libtimer/timer.h>
+#include <libcompandor/compandor.h>
 typedef struct amps amps_t;
 #include "sysinfo.h"
 #include "transaction.h"

src/amps/amps_tacs_main.c

@@ -22,12 +22,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#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 <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 "amps.h"
 #include "dsp.h"
 #include "frame.h"

src/amps/dsp.c

@@ -81,9 +81,9 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
 #include "amps.h"
 #include "frame.h"
 #include "dsp.h"

src/amps/frame.c

@@ -26,8 +26,8 @@
 #include <errno.h>
 #include <math.h>
 #include <inttypes.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
 #include "amps.h"
 #include "dsp.h"
 #include "frame.h"

src/amps/sysinfo.c

@@ -3,7 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include "../libsample/sample.h"
+#include <libsample/sample.h>
 #include "amps.h"
 #include "frame.h"
 #include "main.h"

src/amps/transaction.c

@@ -20,10 +20,10 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/cause.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
 #include "amps.h"
 //#include "database.h"
 

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

src/anetz/anetz.c

@@ -24,12 +24,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#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 <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libtimer/timer.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
+#include <libosmocc/message.h>
 #include "anetz.h"
 #include "dsp.h"
 

src/anetz/anetz.h

@@ -1,6 +1,6 @@
-#include "../libsquelch/squelch.h"
-#include "../libgoertzel/goertzel.h"
-#include "../libmobile/sender.h"
+#include <libsquelch/squelch.h>
+#include <libgoertzel/goertzel.h>
+#include <libmobile/sender.h>
 
 enum dsp_mode {
 	DSP_MODE_SILENCE,	/* send silence to transmitter, block audio from receiver */

src/anetz/dsp.c

@@ -25,10 +25,10 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libtimer/timer.h"
-#include "../libmobile/call.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libtimer/timer.h>
+#include <libmobile/call.h>
 #include "anetz.h"
 #include "dsp.h"
 

src/anetz/main.c

@@ -23,13 +23,13 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#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 <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 "freiton.h"
 #include "besetztton.h"
 #include "anetz.h"

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

src/bnetz/bnetz.c

@@ -24,11 +24,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/cause.h"
-#include "../libosmocc/message.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
+#include <libosmocc/message.h>
 #include "bnetz.h"
 #include "telegramm.h"
 #include "dsp.h"

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 <libsquelch/squelch.h>
+#include <libfsk/fsk.h>
+#include <libmobile/sender.h>
+#include <libtimer/timer.h>
 
 /* fsk modes of transmission */
 enum dsp_mode {

src/bnetz/dialer.c

@@ -23,14 +23,14 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include "../libsample/sample.h"
-#include "../libfsk/fsk.h"
-#include "../libwave/wave.h"
-#include "../libdebug/debug.h"
+#include <libsample/sample.h>
+#include <libfsk/fsk.h>
+#include <libwave/wave.h>
+#include <libdebug/debug.h>
 #ifdef HAVE_ALSA
-#include "../libsound/sound.h"
+#include <libsound/sound.h>
 #endif
-#include "../liboptions/options.h"
+#include <liboptions/options.h>
 #include "telegramm.h"
 
 #define MAX_PAUSE	0.5	/* pause before and after dialing sequence */

src/bnetz/dsp.c

@@ -25,9 +25,9 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
 #include "bnetz.h"
 #include "dsp.h"
 

src/bnetz/main.c

@@ -23,13 +23,13 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/main_mobile.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/main_mobile.h>
 #include "../anetz/freiton.h"
 #include "../anetz/besetztton.h"
-#include "../liboptions/options.h"
+#include <liboptions/options.h>
 #include "bnetz.h"
 #include "dsp.h"
 #include "stations.h"

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

src/cnetz/cnetz.c

@@ -142,11 +142,11 @@
 #include <errno.h>
 #include <math.h>
 #include <inttypes.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/cause.h"
-#include "../libosmocc/message.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
+#include <libosmocc/message.h>
 #include "cnetz.h"
 #include "database.h"
 #include "sysinfo.h"

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 <libcompandor/compandor.h>
+#include <libtimer/timer.h>
+#include <libmobile/sender.h>
+#include <libscrambler/scrambler.h>
 typedef struct cnetz cnetz_t;
 #include "fsk_demod.h"
 #include "transaction.h"

src/cnetz/database.c

@@ -21,8 +21,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
 #include "cnetz.h"
 #include "database.h"
 

src/cnetz/dsp.c

@@ -25,9 +25,9 @@
 #include <string.h>
 #include <math.h>
 #include <errno.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
 #include "cnetz.h"
 #include "sysinfo.h"
 #include "telegramm.h"

src/cnetz/fsk_demod.c

@@ -128,8 +128,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
 #include "cnetz.h"
 #include "dsp.h"
 #include "telegramm.h"

src/cnetz/main.c

@@ -22,14 +22,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../libsample/sample.h"
-#include "../libmobile/main_mobile.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
+#include <libsample/sample.h>
+#include <libmobile/main_mobile.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
 #include "../anetz/freiton.h"
 #include "../anetz/besetztton.h"
-#include "../liboptions/options.h"
-#include "../libfm/fm.h"
+#include <liboptions/options.h>
+#include <libfm/fm.h>
 #include "cnetz.h"
 #include "database.h"
 #include "sysinfo.h"

src/cnetz/telegramm.c

@@ -26,8 +26,8 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
 #include "cnetz.h"
 #include "dsp.h"
 #include "sysinfo.h"

src/cnetz/transaction.c

@@ -20,10 +20,10 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/cause.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
 #include "cnetz.h"
 #include "telegramm.h"
 #include "database.h"

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

src/eurosignal/dsp.c

@@ -25,8 +25,8 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
 #include "eurosignal.h"
 #include "dsp.h"
 

src/eurosignal/eurosignal.c

@@ -25,11 +25,11 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/cause.h"
-#include "../libosmocc/message.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
+#include <libosmocc/message.h>
 #include "eurosignal.h"
 #include "dsp.h"
 

src/eurosignal/eurosignal.h

@@ -1,6 +1,6 @@
-#include "../libfm/fm.h"
-#include "../libmobile/sender.h"
-#include "../libtimer/timer.h"
+#include <libfm/fm.h>
+#include <libmobile/sender.h>
+#include <libtimer/timer.h>
 
 /* current state of transmitter */
 enum euro_health_state {

src/eurosignal/main.c

@@ -22,11 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/main_mobile.h"
-#include "../liboptions/options.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/main_mobile.h>
+#include <liboptions/options.h>
 #include "eurosignal.h"
 #include "dsp.h"
 #include "../anetz/besetztton.h"

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

src/fuenf/dsp.c

@@ -25,9 +25,9 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
 #include "fuenf.h"
 #include "dsp.h"
 

src/fuenf/fuenf.c

@@ -25,12 +25,12 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#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 <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
+#include <libosmocc/message.h>
+#include <liboptions/options.h>
 #include "fuenf.h"
 #include "dsp.h"
 

src/fuenf/fuenf.h

@@ -1,6 +1,6 @@
-#include "../libmobile/sender.h"
-#include "../libgoertzel/goertzel.h"
-#include "../libfm/fm.h"
+#include <libmobile/sender.h>
+#include <libgoertzel/goertzel.h>
+#include <libfm/fm.h>
 
 enum fuenf_state {
 	FUENF_STATE_IDLE = 0,

src/fuenf/main.c

@@ -26,11 +26,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
-#include "../libmobile/main_mobile.h"
-#include "../liboptions/options.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
+#include <libmobile/main_mobile.h>
+#include <liboptions/options.h>
 #include "../anetz/besetztton.h"
 #include "fuenf.h"
 #include "dsp.h"

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

src/fuvst/fuvst.c

@@ -34,13 +34,13 @@
 #include <math.h>
 #include <time.h>
 #include <inttypes.h>
-#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 <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 "fuvst.h"
 
 /* digital loopback test */

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 <libmobile/sender.h>
+#include <libscrambler/scrambler.h>
+#include <libv27/modem.h>
+#include <libmtp/mtp.h>
 #include "mup.h"
 
 enum fuvst_chan_type {

src/fuvst/main.c

@@ -22,13 +22,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#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 <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 "../anetz/freiton.h"
 #include "../anetz/besetztton.h"
 #include "../cnetz/ansage.h"

src/fuvst/mup.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <time.h>
 #include <inttypes.h>
-#include "../libdebug/debug.h"
+#include <libdebug/debug.h>
 #include "mup.h"
 #include "systemmeldungen.h"
 

src/fuvst/sniffer.c

@@ -22,16 +22,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#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 <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>
 
 typedef struct sniffer {
 	sender_t		sender;

src/fuvst/systemmeldungen.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <inttypes.h>
-#include "../libdebug/debug.h"
+#include <libdebug/debug.h>
 #include "systemmeldungen.h"
 
 static struct systemmeldungen {

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

src/imts/dialer.c

@@ -24,13 +24,13 @@
 #include <unistd.h>
 #include <math.h>
 #include <errno.h>
-#include "../libsample/sample.h"
-#include "../libwave/wave.h"
-#include "../libdebug/debug.h"
+#include <libsample/sample.h>
+#include <libwave/wave.h>
+#include <libdebug/debug.h>
 #ifdef HAVE_ALSA
-#include "../libsound/sound.h"
+#include <libsound/sound.h>
 #endif
-#include "../liboptions/options.h"
+#include <liboptions/options.h>
 
 /* presets */
 const char *station_id = "6681739";

src/imts/dsp.c

@@ -25,10 +25,10 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "../libsample/sample.h"
-#include "../libdebug/debug.h"
-#include "../libtimer/timer.h"
-#include "../libmobile/call.h"
+#include <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libtimer/timer.h>
+#include <libmobile/call.h>
 #include "imts.h"
 #include "dsp.h"
 

src/imts/imts.c

@@ -38,12 +38,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#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 <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libtimer/timer.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
+#include <libosmocc/message.h>
 #include "imts.h"
 #include "dsp.h"
 

src/imts/imts.h

@@ -1,6 +1,6 @@
-#include "../libsquelch/squelch.h"
-#include "../libfm/fm.h"
-#include "../libmobile/sender.h"
+#include <libsquelch/squelch.h>
+#include <libfm/fm.h>
+#include <libmobile/sender.h>
 
 enum dsp_mode {
 	DSP_MODE_OFF = 0,	/* transmitter off */

src/imts/main.c

@@ -23,12 +23,12 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#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 <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 "../amps/tones.h"
 #include "../amps/outoforder.h"
 #include "../amps/noanswer.h"

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

src/jolly/dsp.c

@@ -26,10 +26,10 @@
 #include <errno.h>
 #include <math.h>
 
-#include "../libsample/sample.h"
-#include "../libtimer/timer.h"
-#include "../libdebug/debug.h"
-#include "../libmobile/call.h"
+#include <libsample/sample.h>
+#include <libtimer/timer.h>
+#include <libdebug/debug.h>
+#include <libmobile/call.h>
 #include "jolly.h"
 #include "dsp.h"
 #include "voice.h"

src/jolly/jolly.c

@@ -133,12 +133,12 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#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 <libsample/sample.h>
+#include <libdebug/debug.h>
+#include <libtimer/timer.h>
+#include <libmobile/call.h>
+#include <libmobile/cause.h>
+#include <libosmocc/message.h>
 #include "jolly.h"
 #include "dsp.h"
 #include "voice.h"

src/jolly/jolly.h

@@ -1,6 +1,6 @@
-#include "../libsquelch/squelch.h"
-#include "../libmobile/sender.h"
-#include "../libdtmf/dtmf_decode.h"
+#include <libsquelch/squelch.h>
+#include <libmobile/sender.h>
+#include <libdtmf/dtmf_decode.h>
 
 enum jolly_state {
 	STATE_NULL = 0,

src/jolly/main.c

@@ -27,13 +27,13 @@
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "../libsample/sample.h"
-#include "../libmobile/main_mobile.h"
-#include "../libdebug/debug.h"
-#include "../libtimer/timer.h"
+#include <libsample/sample.h>
+#include <libmobile/main_mobile.h>
+#include <libdebug/debug.h>
+#include <libtimer/timer.h>
 #include "../anetz/freiton.h"
 #include "../anetz/besetztton.h"
-#include "../liboptions/options.h"
+#include <liboptions/options.h>
 #include "jolly.h"
 #include "dsp.h"
 #include "voice.h"

src/jolly/voice.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "../libsample/sample.h"
-#include "../libsamplerate/samplerate.h"
+#include <libsample/sample.h>
+#include <libsamplerate/samplerate.h>
 #include "voice.h"
 
 static int16_t digit_0[] = {

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