toplevel Makefile: accept arguments for host ./configure calls

[osmocom-bb.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 3619d49..1567d2d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,9 +8,11 @@ CROSS_TOOL_PREFIX=arm-elf-
 
 TOPDIR=$(shell pwd)
 OSMOCORE_CONFIGURE_ENV= LIBOSMOCORE_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/.libs/libosmocore.a \
-                       LIBOSMOCORE_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include
+                        LIBOSMOVTY_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/vty/.libs/libosmovty.a \
+                       LIBOSMOCORE_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include \
+                       LIBOSMOVTY_CFLAGS=-I$(TOPDIR)/shared/libosmocore/include
 
-all: libosmocore-host libosmocore-target layer23 osmocon firmware
+all: libosmocore-host libosmocore-target layer23 osmocon gsmmap firmware
 
 libosmocore-host: shared/libosmocore/build-host/src/.libs/libosmocore.la
 
@@ -21,7 +23,7 @@ shared/libosmocore/configure: shared/libosmocore/configure.in
        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
@@ -33,8 +35,10 @@ shared/libosmocore/build-target:
        mkdir $@
 
 shared/libosmocore/build-target/Makefile: shared/libosmocore/configure shared/libosmocore/build-target
-       cd shared/libosmocore/build-target && ../configure --host=arm-elf-linux --disable-shared \
-               CFLAGS="-Os -ffunction-sections"
+       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"
 
 shared/libosmocore/build-target/src/.libs/libosmocore.a: shared/libosmocore/build-target/Makefile
        cd shared/libosmocore/build-target && make
@@ -47,12 +51,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
 
@@ -60,7 +77,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