From b98f97e98571877f1c9b9816d1e871c00dbd1bd3 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Tue, 22 Mar 2016 18:29:45 +0100
Subject: [PATCH] pkg: ccn-lite: adapt to use pkg.mk
---
pkg/ccn-lite/Makefile | 30 +++++++-----------------------
pkg/ccn-lite/Makefile.include | 2 +-
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/pkg/ccn-lite/Makefile b/pkg/ccn-lite/Makefile
index 860ecd8611..7c4d8f5cee 100644
--- a/pkg/ccn-lite/Makefile
+++ b/pkg/ccn-lite/Makefile
@@ -1,31 +1,15 @@
PKG_NAME=ccn-lite
PKG_URL=https://github.com/OlegHahm/ccn-lite/
PKG_VERSION=39b1406c11de9de364220909488eebabe7e81613
-PKG_DIR=$(CURDIR)/$(PKG_NAME)
-.PHONY: all clean distclean
+.PHONY: all
export RIOT_CFLAGS = ${CFLAGS} ${INCLUDES}
-all: $(PKG_DIR)/Makefile
- "$(MAKE)" -BC $(PKG_DIR)/src lib-ccn-lite.a
- "$(MAKE)" -BC $(PKG_DIR)/src lib-ccn-lite-utils.a
- cp $(PKG_DIR)/src/lib-ccn-lite.a ${BINDIR}/ccn-lite.a
- cp $(PKG_DIR)/src/lib-ccn-lite-utils.a ${BINDIR}/ccn-lite-utils.a
+all: 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
-$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
-
-$(PKG_DIR)/.git/config:
- test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
-
-clean::
- @echo "Cleaning up CCN-Lite package..."
- @cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
- git clean -x -f && \
- git reset --hard "$(PKG_VERSION)"
-
-distclean::
- rm -rf "$(PKG_DIR)"
-
-Makefile.include:
- @true
+include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/ccn-lite/Makefile.include b/pkg/ccn-lite/Makefile.include
index 40c18ee967..fdf03313e7 100644
--- a/pkg/ccn-lite/Makefile.include
+++ b/pkg/ccn-lite/Makefile.include
@@ -1,2 +1,2 @@
-INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(RIOTPKG)/ccn-lite/ccn-lite/src
+INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(BINDIR)/pkg/ccn-lite/src
INCLUDES += -I$(RIOTBASE)/sys/posix/include
--
GitLab