diff options
| author | Harald Welte <laforge@gnumonks.org> | 2010-02-20 22:16:21 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-02-20 22:16:21 +0100 |
| commit | 2afd5aa843f92fdecdff3196bc12284c5956bed5 (patch) | |
| tree | 36dcfdf4a5c286e8c1cb319d9e4235b256009e6c /src | |
| parent | a036cc2b2ade6f2f44c9601c5be4856d78147520 (diff) | |
build of osmocon using libosmocore
Diffstat (limited to 'src')
| -rw-r--r-- | src/host/osmocon/Makefile | 9 | ||||
| -rw-r--r-- | src/host/osmocon/osmocon.c | 6 | ||||
| -rw-r--r-- | src/target/firmware/comm/sercomm.c | 2 | ||||
| -rw-r--r-- | src/target/firmware/include/comm/sercomm.h | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/src/host/osmocon/Makefile b/src/host/osmocon/Makefile index b3334736..192eacf8 100644 --- 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 094dbeb2..7bc05f02 100644 --- 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 d852eb99..7270c0ec 100644 --- 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 24ad865c..718e12ab 100644 --- 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 |