Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 06818470d4b84f6b6fa82d44795665fde393240e Merge: 0a5c1a8 144c829 Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon Jun 6 23:57:21 2016 +0800

Merge branch 'next'

06818470d4b84f6b6fa82d44795665fde393240e Makefile | 11 ++++++++--- net/batman-adv/soft-interface.c | 9 +++++++++ 2 files changed, 17 insertions(+), 3 deletions(-)

diff --cc Makefile index 365a7cc,2568fb2..725c70b --- a/Makefile +++ b/Makefile @@@ -43,9 -43,8 +43,9 @@@ RM ?= rm - REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) - export NOSTDINC_FLAGS := \ + NOSTDINC_FLAGS += \ -I$(PWD)/compat-include/ \ + -I$(PWD)/include/ \ -include $(PWD)/compat.h \ $(CFLAGS)

@@@ -53,12 -52,12 +53,17 @@@ ifneq ($(REVISION), NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION="$(REVISION)" endif

+include $(PWD)/compat-sources/Makefile + + obj-y += net/batman-adv/ + +export batman-adv-y + ++ BUILD_FLAGS := \ - M=$(PWD)/net/batman-adv \ + M=$(PWD) \ + PWD=$(PWD) \ + REVISION=$(REVISION) \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ CONFIG_BATMAN_ADV_BLA=$(CONFIG_BATMAN_ADV_BLA) \