X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=src%2FMakefile;h=a0dea5db58c95f8c5e5cbe9225c39043520ea8a7;hb=b09aaa1e6d3b75d9eeb65a32dc141ca2b0be6022;hp=8e245dd9a79ed5b73e4cb74bbaa3ac731e36875e;hpb=692df15c8194cd98cbb4d89465ae707ba30bb9b6;p=osmocom-bb.git

diff --git a/src/Makefile b/src/Makefile
index 8e245dd..a0dea5d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,9 +8,12 @@ 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-target nofirmware firmware
+nofirmware: libosmocore-host layer23 osmocon gsmmap
 
 libosmocore-host: shared/libosmocore/build-host/src/.libs/libosmocore.la
 
@@ -21,7 +24,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
@@ -34,8 +37,9 @@ 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-shared --disable-talloc --disable-tests \
-		CC="$(CROSS_TOOL_PREFIX)gcc" CFLAGS="-Os -ffunction-sections -I../../../../target/firmware/include"
+			--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$(TOPDIR)/target/firmware/include"
 
 shared/libosmocore/build-target/src/.libs/libosmocore.a: shared/libosmocore/build-target/Makefile
 	cd shared/libosmocore/build-target && make
@@ -48,12 +52,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
 
@@ -61,7 +78,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