re-structure directory tree in preparation of submodules

This moves src/lib* to src/lib/lib* so that we can use src/lib
from a submodule in a subsequent commit.

configure.ac

@@ -78,17 +78,17 @@ AC_CHECK_LIB([m], [main])
 AC_CHECK_LIB([pthread], [main])
 
 AC_OUTPUT(
-	src/liboptions/Makefile
-	src/libdebug/Makefile
-	src/libsample/Makefile
-	src/libtimer/Makefile
-	src/libjitter/Makefile
-	src/libosmocc/Makefile
-	src/libg711/Makefile
-	src/libwave/Makefile
-	src/libdtmf/Makefile
-	src/libfm/Makefile
-	src/libfilter/Makefile
+	src/lib/liboptions/Makefile
+	src/lib/libdebug/Makefile
+	src/lib/libsample/Makefile
+	src/lib/libtimer/Makefile
+	src/lib/libjitter/Makefile
+	src/lib/libosmocc/Makefile
+	src/lib/libg711/Makefile
+	src/lib/libwave/Makefile
+	src/lib/libdtmf/Makefile
+	src/lib/libfm/Makefile
+	src/lib/libfilter/Makefile
 	src/router/Makefile
 	src/Makefile
 	Makefile)

src/Makefile.am

@@ -1,16 +1,16 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = \
-	liboptions \
-	libdebug \
-	libsample \
-	libtimer \
-	libjitter \
-	libosmocc \
-	libg711 \
-	libwave \
-	libdtmf \
-	libfm \
-	libfilter \
+	lib/liboptions \
+	lib/libdebug \
+	lib/libsample \
+	lib/libtimer \
+	lib/libjitter \
+	lib/libosmocc \
+	lib/libg711 \
+	lib/libwave \
+	lib/libdtmf \
+	lib/libfm \
+	lib/libfilter \
 	router
 

src/router/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-router
@@ -12,15 +12,15 @@ osmo_cc_router_SOURCES = \
 
 osmo_cc_router_LDADD = \
 	$(COMMON_LA) \
-	../libdebug/libdebug.a \
-	../liboptions/liboptions.a \
-	../libsample/libsample.a \
-	../libtimer/libtimer.a \
-	../libjitter/libjitter.a \
-	../libosmocc/libosmocc.a \
-	../libg711/libg711.a \
-	../libdtmf/libdtmf.a \
-	../libfm/libfm.a \
-	../libfilter/libfilter.a \
-	../libwave/libwave.a
+	../lib/libdebug/libdebug.a \
+	../lib/liboptions/liboptions.a \
+	../lib/libsample/libsample.a \
+	../lib/libtimer/libtimer.a \
+	../lib/libjitter/libjitter.a \
+	../lib/libosmocc/libosmocc.a \
+	../lib/libg711/libg711.a \
+	../lib/libdtmf/libdtmf.a \
+	../lib/libfm/libfm.a \
+	../lib/libfilter/libfilter.a \
+	../lib/libwave/libwave.a
 

src/router/audio.c

@@ -95,7 +95,7 @@
 #include <math.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
-#include "../libdebug/debug.h"
+#include <libdebug/debug.h>
 #include "call.h"
 #include "audio.h"
 

src/router/call.c

@@ -70,8 +70,8 @@
 #include <math.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include "../libdebug/debug.h"
-#include "../libg711/g711.h"
+#include <libdebug/debug.h>
+#include <libg711/g711.h>
 #include "call.h"
 #include "audio.h"
 #include "display.h"

src/router/call.h

@@ -1,11 +1,11 @@
 
-#include "../libtimer/timer.h"
-#include "../libosmocc/endpoint.h"
-#include "../libosmocc/helper.h"
-#include "../libsample/sample.h"
-#include "../libjitter/jitter.h"
-#include "../libwave/wave.h"
-#include "../libdtmf/dtmf_decode.h"
+#include <libtimer/timer.h>
+#include <libosmocc/endpoint.h>
+#include <libosmocc/helper.h>
+#include <libsample/sample.h>
+#include <libjitter/jitter.h>
+#include <libwave/wave.h>
+#include <libdtmf/dtmf_decode.h>
 
 
 enum call_state {

src/router/display_status.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
-#include "../libdebug/debug.h"
+#include <libdebug/debug.h>
 #include "call.h"
 #include "display.h"
 

src/router/main.c

@@ -25,9 +25,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <termios.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 "call.h"
 #include "audio.h"
 #include "display.h"

src/router/routing.c

@@ -29,7 +29,7 @@
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <signal.h>
-#include "../libdebug/debug.h"
+#include <libdebug/debug.h>
 #include "call.h"
 
 extern char **environ;