move all libraries from src/lib* to src/lib/lib*

This is in preparation of using the new osmocom-analog-libraries
git as submodule.

configure.ac

@@ -83,16 +83,16 @@ AM_CONDITIONAL(HAVE_ALSA, test "x$with_alsa" == "xyes" )
 AS_IF([test "x$with_alsa" == "xyes"],[AC_MSG_NOTICE( Compiling with Alsa support )], [AC_MSG_NOTICE( Alsa sound card not supported. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. )])
 
 AC_OUTPUT(
-	src/liboptions/Makefile
-	src/libdebug/Makefile
-	src/libsample/Makefile
-	src/libsamplerate/Makefile
-	src/libfilter/Makefile
-	src/libtimer/Makefile
-	src/libjitter/Makefile
-	src/libosmocc/Makefile
-	src/libg711/Makefile
-	src/libsound/Makefile
+	src/lib/liboptions/Makefile
+	src/lib/libdebug/Makefile
+	src/lib/libsample/Makefile
+	src/lib/libsamplerate/Makefile
+	src/lib/libfilter/Makefile
+	src/lib/libtimer/Makefile
+	src/lib/libjitter/Makefile
+	src/lib/libosmocc/Makefile
+	src/lib/libg711/Makefile
+	src/lib/libsound/Makefile
 	src/telephone/Makefile
 	src/Makefile
 	Makefile)

src/Makefile.am

@@ -1,19 +1,19 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = \
-	liboptions \
-	libdebug \
-	libsample \
-	libsamplerate \
-	libfilter \
-	libtimer \
-	libjitter \
-	libosmocc \
-	libg711
+	lib/liboptions \
+	lib/libdebug \
+	lib/libsample \
+	lib/libsamplerate \
+	lib/libfilter \
+	lib/libtimer \
+	lib/libjitter \
+	lib/libosmocc \
+	lib/libg711
 
 if HAVE_ALSA
 SUBDIRS += \
-        libsound
+        lib/libsound
 endif
 
 SUBDIRS += \

src/telephone/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib
 
 bin_PROGRAMS = \
 	osmo-cc-alsa-endpoint
@@ -9,22 +9,22 @@ osmo_cc_alsa_endpoint_SOURCES = \
 
 osmo_cc_alsa_endpoint_LDADD = \
 	$(COMMON_LA) \
-	../libdebug/libdebug.a \
-	../liboptions/liboptions.a \
-	../libsample/libsample.a \
-	../libsamplerate/libsamplerate.a \
-	../libfilter/libfilter.a \
-	../libtimer/libtimer.a \
-	../libjitter/libjitter.a \
-	../libosmocc/libosmocc.a \
-	../libg711/libg711.a \
+	../lib/libdebug/libdebug.a \
+	../lib/liboptions/liboptions.a \
+	../lib/libsample/libsample.a \
+	../lib/libsamplerate/libsamplerate.a \
+	../lib/libfilter/libfilter.a \
+	../lib/libtimer/libtimer.a \
+	../lib/libjitter/libjitter.a \
+	../lib/libosmocc/libosmocc.a \
+	../lib/libg711/libg711.a \
 	-lm
 
 if HAVE_ALSA
 AM_CPPFLAGS += -DHAVE_ALSA
 
 osmo_cc_alsa_endpoint_LDADD += \
-	../libsound/libsound.a \
+	../lib/libsound/libsound.a \
 	$(ALSA_LIBS)
 endif
 

src/telephone/main.c

@@ -26,9 +26,9 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <sched.h>
-#include "../libdebug/debug.h"
-#include "../liboptions/options.h"
-#include "../libg711/g711.h"
+#include <libdebug/debug.h>
+#include <liboptions/options.h>
+#include <libg711/g711.h>
 #include "telephone.h"
 
 telephone_t *telephone_ep = NULL;

src/telephone/telephone.c

@@ -26,12 +26,12 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <stddef.h>
-#include "../libdebug/debug.h"
-#include "../libsample/sample.h"
-#include "../libg711/g711.h"
-#include "../libsound/sound.h"
+#include <libdebug/debug.h>
+#include <libsample/sample.h>
+#include <libg711/g711.h>
+#include <libsound/sound.h>
 #include "telephone.h"
-#include "../libosmocc/helper.h"
+#include <libosmocc/helper.h>
 
 static struct osmo_cc_helper_audio_codecs codecs[] = {
 	{ "PCMA", 8000, 1, g711_encode_alaw, g711_decode_alaw },

src/telephone/telephone.h

@@ -1,9 +1,9 @@
 
-#include "../libtimer/timer.h"
-#include "../libosmocc/endpoint.h"
-#include "../libsample/sample.h"
-#include "../libsamplerate/samplerate.h"
-#include "../libjitter/jitter.h"
+#include <libtimer/timer.h>
+#include <libosmocc/endpoint.h>
+#include <libsample/sample.h>
+#include <libsamplerate/samplerate.h>
+#include <libjitter/jitter.h>
 
 enum call_state {
 	CALL_STATE_IDLE = 0,    /* no call */