Fixed broken gsmmap.

[osmocom-bb.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 6d16b7d..de1435d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,29 +1,37 @@
 
 # this is not really used as we don't do 'make install'. You can still specify
 # it in case you _want_ to manually 'make install' the target libosmocore.
-CROSS_INST_PREFIX=/usr/local/stow/osmocom-bb/arm-elf
+CROSS_INST_PREFIX ?= /usr/local/stow/osmocom-bb/arm-2010.09
+
+# this is the host tuple of your cross-toolchain
+CROSS_HOST ?= $(shell which arm-elf-gcc >/dev/null 2>&1 && echo arm-elf || echo arm-none-eabi)
 
 # this is the prefix of your cross-toolchain programs
-CROSS_TOOL_PREFIX=arm-elf-
+CROSS_TOOL_PREFIX=$(CROSS_HOST)-
 
 TOPDIR=$(shell pwd)
 OSMOCORE_CONFIGURE_ENV= LIBOSMOCORE_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/.libs/libosmocore.a \
                         LIBOSMOVTY_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/vty/.libs/libosmovty.a \
+                       LIBOSMOGSM_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/gsm/.libs/libosmogsm.a \
+                       LIBOSMOCODEC_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/codec/.libs/libosmocodec.a \
                        LIBOSMOCORE_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include \
-                       LIBOSMOVTY_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include
+                       LIBOSMOVTY_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include \
+                       LIBOSMOGSM_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include \
+                       LIBOSMOCODEC_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include
 
-all: libosmocore-host libosmocore-target layer23 osmocon firmware
+all: libosmocore-target nofirmware firmware mtk-firmware
+nofirmware: libosmocore-host layer23 osmocon gsmmap
 
 libosmocore-host: shared/libosmocore/build-host/src/.libs/libosmocore.la
 
 shared/libosmocore/build-host:
        mkdir $@
 
-shared/libosmocore/configure: shared/libosmocore/configure.in
+shared/libosmocore/configure: shared/libosmocore/configure.ac
        cd shared/libosmocore && autoreconf -i
 
 shared/libosmocore/build-host/Makefile: shared/libosmocore/configure shared/libosmocore/build-host
-       cd shared/libosmocore/build-host && ../configure
+       cd shared/libosmocore/build-host && ../configure $(HOST_CONFARGS)
 
 shared/libosmocore/build-host/src/.libs/libosmocore.la: shared/libosmocore/build-host/Makefile
        cd shared/libosmocore/build-host && make
@@ -36,9 +44,11 @@ shared/libosmocore/build-target:
 
 shared/libosmocore/build-target/Makefile: shared/libosmocore/configure shared/libosmocore/build-target
        cd shared/libosmocore/build-target && ../configure \
-                       --host=arm-elf-linux --disable-vty --enable-panic-infloop \
-                       --disable-shared --disable-talloc --disable-tests \
-               CC="$(CROSS_TOOL_PREFIX)gcc" CFLAGS="-Os -ffunction-sections -I../../../../target/firmware/include"
+                       --host=$(CROSS_HOST) --disable-vty --enable-panic-infloop \
+                       --disable-shared --disable-talloc \
+                       --disable-tests ac_cv_header_sys_select_h=no \
+                       --disable-tests ac_cv_header_sys_socket_h=no \
+               CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs"
 
 shared/libosmocore/build-target/src/.libs/libosmocore.a: shared/libosmocore/build-target/Makefile
        cd shared/libosmocore/build-target && make
@@ -51,12 +61,25 @@ host/osmocon/configure: host/osmocon/configure.ac
        cd host/osmocon && autoreconf -i
 
 host/osmocon/Makefile: host/osmocon/configure
-       cd host/osmocon && $(OSMOCORE_CONFIGURE_ENV) ./configure
+       cd host/osmocon && $(OSMOCORE_CONFIGURE_ENV) ./configure $(HOST_CONFARGS)
 
 host/osmocon/osmocon: host/osmocon/Makefile libosmocore-host
        make -C host/osmocon
 
 
+.PHONY: gsmmap
+gsmmap: host/gsmmap/gsmmap
+
+host/gsmmap/configure: host/gsmmap/configure.ac
+       cd host/gsmmap && autoreconf -i
+
+host/gsmmap/Makefile: host/gsmmap/configure
+       cd host/gsmmap && $(OSMOCORE_CONFIGURE_ENV) ./configure $(HOST_CONFARGS)
+
+host/gsmmap/gsmmap: host/gsmmap/Makefile libosmocore-host
+       make -C host/gsmmap
+
+
 .PHONY: layer23
 layer23: host/layer23/layer23
 
@@ -64,7 +87,7 @@ host/layer23/configure: host/layer23/configure.ac
        cd host/layer23 && autoreconf -i
 
 host/layer23/Makefile: host/layer23/configure
-       cd host/layer23 && $(OSMOCORE_CONFIGURE_ENV) ./configure
+       cd host/layer23 && $(OSMOCORE_CONFIGURE_ENV) ./configure $(HOST_CONFARGS)
 
 host/layer23/layer23: host/layer23/Makefile libosmocore-host
        make -C host/layer23
@@ -74,6 +97,10 @@ host/layer23/layer23: host/layer23/Makefile libosmocore-host
 firmware: libosmocore-target
        make -C target/firmware CROSS_COMPILE=$(CROSS_TOOL_PREFIX)
 
+.PHONY: mtk-firmware
+mtk-firmware: libosmocore-target
+       make -C target/firmware -f Makefile.mtk CROSS_COMPILE=$(CROSS_TOOL_PREFIX)
+
 
 clean:
        make -C shared/libosmocore/build-host $@
@@ -81,10 +108,12 @@ clean:
        make -C host/layer23 $@
        make -C host/osmocon $@
        make -C target/firmware $@
+       make -C target/firmware -f Makefile.mtk $@
 
 distclean:
        rm -rf shared/libosmocore/build-host
        rm -rf shared/libosmocore/build-target
        make -C host/layer23 $@
        make -C host/osmocon $@
+# 'firmware' also handles 'mtk-firmware'
        make -C target/firmware $@