re-structure directory tree in preparation of submodules

This moves src/lib* to src/lib/lib* so that we can replace it
with the osmocom-analog-libraries.git submodule in a subsequent
commit.

configure.ac

@@ -80,13 +80,13 @@ 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/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/isdn/Makefile
 	src/Makefile
 	Makefile)

src/Makefile.am

@@ -1,12 +1,12 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = \
-	liboptions \
-	libdebug \
-	libsample \
-	libtimer \
-	libjitter \
-	libosmocc \
-	libg711 \
+	lib/liboptions \
+	lib/libdebug \
+	lib/libsample \
+	lib/libtimer \
+	lib/libjitter \
+	lib/libosmocc \
+	lib/libg711 \
 	isdn
 

src/isdn/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-misdn-endpoint
@@ -11,12 +11,12 @@ osmo_cc_misdn_endpoint_SOURCES = \
 
 osmo_cc_misdn_endpoint_LDADD = \
 	$(COMMON_LA) \
-	../libdebug/libdebug.a \
-	../liboptions/liboptions.a \
-	../libsample/libsample.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/libtimer/libtimer.a \
+	../lib/libjitter/libjitter.a \
+	../lib/libosmocc/libosmocc.a \
+	../lib/libg711/libg711.a \
 	-lmisdn
 

src/isdn/dss1.c

@@ -25,8 +25,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <mISDN/mbuffer.h>
-#include "../libdebug/debug.h"
-#include "../libg711/g711.h"
+#include <libdebug/debug.h>
+#include <libg711/g711.h>
 #include "isdn.h"
 #include "dss1.h"
 #include "ie.h"

src/isdn/ie.c

@@ -13,7 +13,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include "../libdebug/debug.h"
+#include <libdebug/debug.h>
 #ifndef u_char
 #define u_char unsigned char
 #endif

src/isdn/isdn.c

@@ -27,8 +27,8 @@
 #include <sys/ioctl.h>
 #include <stddef.h>
 #include <mISDN/mbuffer.h>
-#include "../libdebug/debug.h"
-#include "../libg711/g711.h"
+#include <libdebug/debug.h>
+#include <libg711/g711.h>
 #include "isdn.h"
 #include "dss1.h"
 #include "ie.h"

src/isdn/isdn.h

@@ -1,10 +1,10 @@
 
 #include <pthread.h>
-#include "../libtimer/timer.h"
-#include "../libosmocc/endpoint.h"
-#include "../libosmocc/helper.h"
-#include "../libsample/sample.h"
-#include "../libjitter/jitter.h"
+#include <libtimer/timer.h>
+#include <libosmocc/endpoint.h>
+#include <libosmocc/helper.h>
+#include <libsample/sample.h>
+#include <libjitter/jitter.h>
 
 #define B_MODE_TRANSPARENT	0
 #define B_MODE_HDLC		1

src/isdn/main.c

@@ -24,9 +24,9 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.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 <mISDN/mbuffer.h>
 #include "isdn.h"
 #include "dss1.h"