From b69941f334e4a0361b19c7b3915fa850a0d80758 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: cmsis-dsp: adapt to use pkg.mk --- pkg/cmsis-dsp/Makefile | 23 ++++------------------- pkg/cmsis-dsp/Makefile.include | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/pkg/cmsis-dsp/Makefile b/pkg/cmsis-dsp/Makefile index 0c9510b6e4..17dae9ae24 100644 --- a/pkg/cmsis-dsp/Makefile +++ b/pkg/cmsis-dsp/Makefile @@ -1,29 +1,14 @@ PKG_NAME=cmsis-dsp PKG_URL=https://github.com/gebart/CMSIS-DSP.git PKG_VERSION=v1.4.5a-riot1 -PKG_DIR=$(CURDIR)/$(PKG_NAME) ifneq ($(RIOTBASE),) include $(RIOTBASE)/Makefile.base endif -.PHONY: all clean patch distclean +.PHONY: all -all: $(PKG_DIR)/Makefile - $(MAKE) -C $(CURDIR)/$(PKG_NAME) +all: download + $(MAKE) -C $(PKG_BUILDDIR) -$(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 $(PKG_NAME) package..." - @-cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \ - git clean -x -f && \ - git am --abort && \ - git reset --hard "$(PKG_VERSION)" - -distclean:: - rm -rf "$(PKG_DIR)" +include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/cmsis-dsp/Makefile.include b/pkg/cmsis-dsp/Makefile.include index 835c7b44b7..3fdfa74e9a 100644 --- a/pkg/cmsis-dsp/Makefile.include +++ b/pkg/cmsis-dsp/Makefile.include @@ -1 +1 @@ -INCLUDES += -I$(RIOTPKG)/cmsis-dsp/cmsis-dsp/include +INCLUDES += -I$(BINDIR)/pkg/cmsis-dsp/include -- GitLab