build of osmocon using libosmocore

diff --git a/src/host/osmocon/Makefile b/src/host/osmocon/Makefile
index b333473..192eacf 100644 (file)
--- a/src/host/osmocon/Makefile
+++ b/src/host/osmocon/Makefile
@@ -1,10 +1,13 @@
 all: osmocon
 
-OSMOCOM_SRC=../libosmocom/src/select.c ../libosmocom/src/timer.c \
-           ../libosmocom/src/msgb.c ../libosmocom/src/talloc.c  \
+OSMOCORE=../../shared/libosmocore
+CFLAGS+=-DHAVE_SYS_SELECT_H
+
+OSMOCOM_SRC=$(OSMOCORE)/src/select.c $(OSMOCORE)/src/timer.c \
+           $(OSMOCORE)/src/msgb.c $(OSMOCORE)/src/talloc.c  \
            ../libosmocom/src/debug.c
 SERCOMM_SRC=../../target/firmware/comm/sercomm.c
-INCLUDES=-I../libosmocom/include -I../../target/firmware/include/comm
+INCLUDES=-I$(OSMOCORE)/include -I../libosmocom/include -I../../target/firmware/include/comm
 
 .PHONY: version.h
 version.h:

diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c
index 094dbeb..7bc05f0 100644 (file)
--- a/src/host/osmocon/osmocon.c
+++ b/src/host/osmocon/osmocon.c
@@ -14,9 +14,9 @@
 
 #include <sercomm.h>
 
-#include <osmocom/linuxlist.h>
-#include <osmocom/select.h>
-#include <osmocom/talloc.h>
+#include <osmocore/linuxlist.h>
+#include <osmocore/select.h>
+#include <osmocore/talloc.h>
 
 #include "version.h"
 

diff --git a/src/target/firmware/comm/sercomm.c b/src/target/firmware/comm/sercomm.c
index d852eb9..7270c0e 100644 (file)
--- a/src/target/firmware/comm/sercomm.c
+++ b/src/target/firmware/comm/sercomm.c
@@ -28,7 +28,7 @@
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 #endif
-#include <osmocom/msgb.h>
+#include <osmocore/msgb.h>
 #include <sercomm.h>
 
 #else

diff --git a/src/target/firmware/include/comm/sercomm.h b/src/target/firmware/include/comm/sercomm.h
index 24ad865..718e12a 100644 (file)
--- a/src/target/firmware/include/comm/sercomm.h
+++ b/src/target/firmware/include/comm/sercomm.h
@@ -4,7 +4,7 @@
 /* SERCOMM layer on UART1 (modem UART) */
 
 #ifdef HOST_BUILD
-#include <osmocom/msgb.h>
+#include <osmocore/msgb.h>
 #else
 #include <comm/msgb.h>
 #define SERCOMM_UART_NR        1