pkg: ccn-lite: adapt to v2

Makefile.dep

@@ -664,6 +664,10 @@ ifneq (,$(filter nanocoap_%,$(USEMODULE)))
   USEMODULE += nanocoap
 endif
 
+ifneq (,$(filter ccn-lite,$(USEPKG)))
+  USEMODULE += ccn-lite-utils
+endif
+
 # always select gpio (until explicit dependencies are sorted out)
 FEATURES_OPTIONAL += periph_gpio
 

examples/ccn-lite-relay/Makefile

@@ -41,6 +41,5 @@ USEMODULE += prng_minstd
 USEPKG += tlsf
 
 USEPKG += ccn-lite
-USEMODULE += ccn-lite-utils
 
 include $(RIOTBASE)/Makefile.include

makefiles/pseudomodules.inc.mk

@@ -2,6 +2,7 @@ PSEUDOMODULES += auto_init_gnrc_rpl
 PSEUDOMODULES += can_mbox
 PSEUDOMODULES += can_pm
 PSEUDOMODULES += can_raw
+PSEUDOMODULES += ccn-lite-utils
 PSEUDOMODULES += cbor_ctime
 PSEUDOMODULES += cbor_float
 PSEUDOMODULES += cbor_semantic_tagging

pkg/ccn-lite/Makefile

@@ -1,16 +1,14 @@
 PKG_NAME=ccn-lite
 PKG_URL=https://github.com/cn-uofbasel/ccn-lite/
-PKG_VERSION=7b973a737dba47fe6c1ee2d58e06dd9a22209fde
+PKG_VERSION=0474080335aac08d3afa44a439ac9def92b9fcf3
 PKG_LICENSE=ISC
 
 .PHONY: all
 
 export RIOT_CFLAGS = ${CFLAGS} ${INCLUDES}
 
 all: git-download
-	"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite.a
-	"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite-utils.a
-	cp $(PKG_BUILDDIR)/src/lib-ccn-lite.a ${BINDIR}/ccn-lite.a
-	cp $(PKG_BUILDDIR)/src/lib-ccn-lite-utils.a ${BINDIR}/ccn-lite-utils.a
+	cd $(PKG_BUILDDIR)/src && cmake -DCCNL_RIOT=1 -DRIOT_CFLAGS="${RIOT_CFLAGS}" . && make
+	cp $(PKG_BUILDDIR)/src/lib/libccnl-riot.a ${BINDIR}/ccn-lite.a
 
 include $(RIOTBASE)/pkg/pkg.mk

pkg/ccn-lite/Makefile.include

@@ -1,4 +1,7 @@
-INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(PKGDIRBASE)/ccn-lite/src
+INCLUDES += -I$(PKGDIRBASE)/ccn-lite/src/ccnl-riot/include
+INCLUDES += -I$(PKGDIRBASE)/ccn-lite/src/ccnl-core/include
+INCLUDES += -I$(PKGDIRBASE)/ccn-lite/src/ccnl-pkt/include
+INCLUDES += -I$(PKGDIRBASE)/ccn-lite/src/ccnl-fwd/include
 INCLUDES += -I$(RIOTBASE)/sys/posix/include
 
 CFLAGS += -DCCNL_RIOT