From 5586d8f1bc649d356093295856feaf2e2c965def Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser <kaspar@schleiser.de> Date: Tue, 22 Mar 2016 18:29:46 +0100 Subject: [PATCH] pkg: microcoap: adapt to use pkg.mk --- pkg/microcoap/Makefile | 30 ++++-------------------------- pkg/microcoap/Makefile.include | 2 +- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/pkg/microcoap/Makefile b/pkg/microcoap/Makefile index c199e9c74d..e837d11f17 100644 --- a/pkg/microcoap/Makefile +++ b/pkg/microcoap/Makefile @@ -1,37 +1,15 @@ PKG_NAME=microcoap PKG_URL=git://github.com/1248/microcoap.git PKG_VERSION=9cb1dcda2182a8dca8483b230cda8b591a924c82 -PKG_DIR=$(CURDIR)/$(PKG_NAME) ifneq ($(RIOTBASE),) INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \ -I$(RIOTBASE)/sys/posix/include endif -.PHONY: all clean patch reset +.PHONY: all -all: patch - "$(MAKE)" -C $(PKG_DIR) +all: download + "$(MAKE)" -C $(PKG_BUILDDIR) -patch: $(PKG_DIR)/Makefile - -$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config - cd "$(PKG_DIR)" && git am --ignore-whitespace "$(CURDIR)"/*.patch - -$(PKG_DIR)/.git/config: - test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)" - -clean:: - @echo "Cleaning up $(PKG_NAME) package..." - @cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \ - git clean -x -f && \ - git am --abort && \ - git reset --hard "$(PKG_VERSION)" && \ - $(MAKE) patch || true - - -distclean:: - rm -rf "$(PKG_DIR)" - -Makefile.include: - @true +include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/microcoap/Makefile.include b/pkg/microcoap/Makefile.include index e1998cb617..af7e8531bf 100644 --- a/pkg/microcoap/Makefile.include +++ b/pkg/microcoap/Makefile.include @@ -1 +1 @@ -INCLUDES += -I$(RIOTPKG)/microcoap/microcoap +INCLUDES += -I$(BINDIR)/pkg/microcoap -- GitLab