From 385ad95701983f566f7b6522325b628d278004b1 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Sat, 13 Jun 2020 20:58:27 +0200 Subject: [PATCH] pkg: adapt 'simple' packages to the new organization --- pkg/c25519/Makefile | 14 +++++++------- pkg/cayenne-lpp/Makefile | 2 +- pkg/cifra/Makefile | 2 +- pkg/cmsis-dsp/Makefile | 2 +- pkg/cmsis-nn/Makefile | 2 +- pkg/cn-cbor/Makefile | 2 +- pkg/driver_bme680/Makefile | 2 +- pkg/emb6/Makefile | 4 ++-- pkg/fatfs/Makefile | 2 +- pkg/gecko_sdk/Makefile | 2 +- pkg/hacl/Makefile | 2 +- pkg/heatshrink/Makefile | 2 +- pkg/jsmn/Makefile | 2 +- pkg/libb2/Makefile | 3 +-- pkg/libbase58/Makefile | 2 +- pkg/libcoap/Makefile | 2 +- pkg/libcose/Makefile | 4 ++-- pkg/libfixmath/Makefile | 4 ++-- pkg/libfixmath/Makefile.include | 6 +++--- pkg/libhydrogen/Makefile | 2 +- pkg/littlefs/Makefile | 2 +- pkg/littlefs2/Makefile | 2 +- pkg/lora-serialization/Makefile | 2 +- pkg/lua/Makefile | 2 +- pkg/lvgl/Makefile | 2 +- pkg/lwip/Makefile | 18 +++++++++--------- pkg/micro-ecc/Makefile | 2 +- pkg/microcoap/Makefile | 2 +- pkg/minmea/Makefile | 2 +- pkg/monocypher/Makefile | 4 ++-- pkg/nanocbor/Makefile | 2 +- pkg/nanopb/Makefile | 2 +- pkg/ndn-riot/Makefile | 2 +- pkg/nimble/Makefile | 2 +- pkg/qDSA/Makefile | 2 +- pkg/qcbor/Makefile | 2 +- pkg/semtech-loramac/Makefile | 2 +- pkg/spiffs/Makefile | 2 +- pkg/talking_leds/Makefile | 2 +- pkg/tensorflow-lite/Makefile | 16 ++++++++-------- pkg/tiny-asn1/Makefile | 2 +- pkg/tinycbor/Makefile | 2 +- pkg/tinycrypt/Makefile | 2 +- pkg/tinydtls/Makefile | 6 +++--- pkg/tlsf/Makefile | 2 +- pkg/tweetnacl/Makefile | 2 +- pkg/u8g2/Makefile | 4 ++-- pkg/ubasic/Makefile | 4 ++-- pkg/ucglib/Makefile | 6 +++--- pkg/umorse/Makefile | 2 +- pkg/utensor/Makefile | 8 +++----- pkg/wakaama/Makefile | 6 +++--- pkg/wolfssl/Makefile | 6 +++--- pkg/wolfssl/Makefile.include | 2 +- pkg/yxml/Makefile | 2 +- 55 files changed, 94 insertions(+), 97 deletions(-) diff --git a/pkg/c25519/Makefile b/pkg/c25519/Makefile index beea5a7f4d..14e36613fb 100644 --- a/pkg/c25519/Makefile +++ b/pkg/c25519/Makefile @@ -5,7 +5,7 @@ PKG_EXT = zip PKG_LICENSE = PD PKG_SHA512 = dbfb4285837ab2ea3d99c448b22877cc7a139ccbaebb1de367e2bec1fd562fe629b389d86603915448078b8fd7e631c8fc9a7d126eb889a1ba0c17611369b190 -PKG_BUILDDIR ?= $(PKGDIRBASE)/$(PKG_NAME) +PKG_SOURCE_DIR ?= $(PKGDIRBASE)/$(PKG_NAME) PKG_ZIPFILE = $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) ifneq ($(RIOTBASE),) @@ -14,12 +14,12 @@ endif .PHONY: all clean distclean -prepare: $(PKG_BUILDDIR)/ +prepare: $(PKG_SOURCE_DIR)/ -all: $(PKG_BUILDDIR)/ - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) +all: $(PKG_SOURCE_DIR)/ + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) -$(PKG_BUILDDIR)/: $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) +$(PKG_SOURCE_DIR)/: $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) test "$(PKG_SHA512) $(PKG_ZIPFILE)" = "$$(sha512sum "${PKG_ZIPFILE}")" $(Q)$(UNZIP_HERE) -D -d $(PKGDIRBASE) $< @@ -29,7 +29,7 @@ $(PKG_ZIPFILE): clean:: # Reset package to checkout state. - rm -rf $(PKG_BUILDDIR) + rm -rf $(PKG_SOURCE_DIR) distclean:: - rm -rf $(PKG_BUILDDIR) $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) + rm -rf $(PKG_SOURCE_DIR) $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) diff --git a/pkg/cayenne-lpp/Makefile b/pkg/cayenne-lpp/Makefile index 36587989d2..364b0e1c96 100644 --- a/pkg/cayenne-lpp/Makefile +++ b/pkg/cayenne-lpp/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=LGPLv2.1 include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/cifra/Makefile b/pkg/cifra/Makefile index e44a7e3f8f..0d0219cf95 100644 --- a/pkg/cifra/Makefile +++ b/pkg/cifra/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=CC-0 include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.cifra + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(CURDIR)/Makefile.cifra diff --git a/pkg/cmsis-dsp/Makefile b/pkg/cmsis-dsp/Makefile index d465cac151..fd29f2666f 100644 --- a/pkg/cmsis-dsp/Makefile +++ b/pkg/cmsis-dsp/Makefile @@ -8,4 +8,4 @@ include $(RIOTBASE)/pkg/pkg.mk CFLAGS += -Wno-strict-aliasing -Wno-unused-parameter all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) all + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(CURDIR)/Makefile.$(PKG_NAME) all diff --git a/pkg/cmsis-nn/Makefile b/pkg/cmsis-nn/Makefile index 982c017e83..1907e11813 100644 --- a/pkg/cmsis-nn/Makefile +++ b/pkg/cmsis-nn/Makefile @@ -7,4 +7,4 @@ CFLAGS += -Wno-strict-aliasing -Wno-unused-parameter include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(CURDIR)/Makefile.$(PKG_NAME) diff --git a/pkg/cn-cbor/Makefile b/pkg/cn-cbor/Makefile index 58b1635f9b..a7688ab962 100644 --- a/pkg/cn-cbor/Makefile +++ b/pkg/cn-cbor/Makefile @@ -9,4 +9,4 @@ include $(RIOTBASE)/pkg/pkg.mk CFLAGS += -DCBOR_ALIGN_READS all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) diff --git a/pkg/driver_bme680/Makefile b/pkg/driver_bme680/Makefile index e5b74428d0..f041ae41b1 100644 --- a/pkg/driver_bme680/Makefile +++ b/pkg/driver_bme680/Makefile @@ -12,4 +12,4 @@ endif .PHONY: all all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/emb6/Makefile b/pkg/emb6/Makefile index 883e545053..95e133e5f8 100644 --- a/pkg/emb6/Makefile +++ b/pkg/emb6/Makefile @@ -19,11 +19,11 @@ EMB6_SUBMODULES:=$(filter-out emb6_contrib \ emb6_sock_%,$(filter emb6_%,$(USEMODULE))) all: $(EMB6_SUBMODULES) - "$(MAKE)" -C $(PKG_BUILDDIR) + "$(MAKE)" -C $(PKG_SOURCE_DIR) # Rule for all submodules emb6_%: - "$(MAKE)" -C $(dir $(shell grep -lR "MODULE.*=.*\<$@\>" $(PKG_BUILDDIR))) + "$(MAKE)" -C $(dir $(shell grep -lR "MODULE.*=.*\<$@\>" $(PKG_SOURCE_DIR))) ifeq (llvm,$(TOOLCHAIN)) CFLAGS += -Wno-tautological-compare diff --git a/pkg/fatfs/Makefile b/pkg/fatfs/Makefile index dd4c76ffb1..6caa89cf64 100644 --- a/pkg/fatfs/Makefile +++ b/pkg/fatfs/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=BSD-1-Clause include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/gecko_sdk/Makefile b/pkg/gecko_sdk/Makefile index feda96a62b..7c9807a69a 100644 --- a/pkg/gecko_sdk/Makefile +++ b/pkg/gecko_sdk/Makefile @@ -14,4 +14,4 @@ ifneq (llvm,$(TOOLCHAIN)) endif all: - "$(MAKE)" -C $(PKG_BUILDDIR)/dist + "$(MAKE)" -C $(PKG_SOURCE_DIR)/dist diff --git a/pkg/hacl/Makefile b/pkg/hacl/Makefile index 901b846c73..59c238ccbf 100644 --- a/pkg/hacl/Makefile +++ b/pkg/hacl/Makefile @@ -8,4 +8,4 @@ include $(RIOTBASE)/pkg/pkg.mk CFLAGS += -DKRML_NOUINT128 -Wno-unused-parameter all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/heatshrink/Makefile b/pkg/heatshrink/Makefile index 42dd977927..d85a88b79f 100644 --- a/pkg/heatshrink/Makefile +++ b/pkg/heatshrink/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=ISC-License include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.heatshrink + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(CURDIR)/Makefile.heatshrink diff --git a/pkg/jsmn/Makefile b/pkg/jsmn/Makefile index 0b1c4889b0..ab754ebb31 100644 --- a/pkg/jsmn/Makefile +++ b/pkg/jsmn/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=MIT include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/libb2/Makefile b/pkg/libb2/Makefile index 749b642f7e..4a4d2a98bb 100644 --- a/pkg/libb2/Makefile +++ b/pkg/libb2/Makefile @@ -6,5 +6,4 @@ PKG_LICENSE = CC0-1.0 include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src \ - -f $(CURDIR)/Makefile.$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(CURDIR)/Makefile.$(PKG_NAME) diff --git a/pkg/libbase58/Makefile b/pkg/libbase58/Makefile index bbe4827606..974c1508bd 100644 --- a/pkg/libbase58/Makefile +++ b/pkg/libbase58/Makefile @@ -8,4 +8,4 @@ include $(RIOTBASE)/pkg/pkg.mk .PHONY: all all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(CURDIR)/Makefile.$(PKG_NAME) diff --git a/pkg/libcoap/Makefile b/pkg/libcoap/Makefile index fa37928308..3deaacf865 100644 --- a/pkg/libcoap/Makefile +++ b/pkg/libcoap/Makefile @@ -13,4 +13,4 @@ ifeq (llvm,$(TOOLCHAIN)) endif all: - "$(MAKE)" -C $(PKG_BUILDDIR) + "$(MAKE)" -C $(PKG_SOURCE_DIR) diff --git a/pkg/libcose/Makefile b/pkg/libcose/Makefile index 449e5fb29c..4b2295d5f5 100644 --- a/pkg/libcose/Makefile +++ b/pkg/libcose/Makefile @@ -6,5 +6,5 @@ PKG_LICENSE=LGPL include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) - "$(MAKE)" -C $(PKG_BUILDDIR)/src/crypt -f $(CURDIR)/Makefile.$(PKG_NAME)_crypt + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src/crypt -f $(CURDIR)/Makefile.$(PKG_NAME)_crypt diff --git a/pkg/libfixmath/Makefile b/pkg/libfixmath/Makefile index 1b83b39fd7..300554a6c7 100644 --- a/pkg/libfixmath/Makefile +++ b/pkg/libfixmath/Makefile @@ -6,7 +6,7 @@ PKG_LICENSE := MIT include $(RIOTBASE)/pkg/pkg.mk all: $(filter libfixmath-unittests,$(USEMODULE)) - "$(MAKE)" -C $(PKG_BUILDDIR)/$(PKG_NAME) -f $(CURDIR)/Makefile.$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/$(PKG_NAME) -f $(CURDIR)/Makefile.$(PKG_NAME) libfixmath-unittests: - "$(MAKE)" -C $(PKG_BUILDDIR)/unittests -f $(CURDIR)/Makefile.$(PKG_NAME)-unittests + "$(MAKE)" -C $(PKG_SOURCE_DIR)/unittests -f $(CURDIR)/Makefile.$(PKG_NAME)-unittests diff --git a/pkg/libfixmath/Makefile.include b/pkg/libfixmath/Makefile.include index e136937f3a..92e4cb6266 100644 --- a/pkg/libfixmath/Makefile.include +++ b/pkg/libfixmath/Makefile.include @@ -1,4 +1,4 @@ -PKG_BUILDDIR ?= $(PKGDIRBASE)/libfixmath +PKG_SOURCE_DIR ?= $(PKGDIRBASE)/libfixmath # The static cache is huge, disable it. CFLAGS += -DFIXMATH_NO_CACHE @@ -7,8 +7,8 @@ ifneq (,$(filter arch_8bit,$(FEATURES_USED))) CFLAGS += -DFIXMATH_OPTIMIZE_8BIT endif -INCLUDES += -I$(PKG_BUILDDIR)/libfixmath +INCLUDES += -I$(PKG_SOURCE_DIR)/libfixmath ifneq (,$(filter libfixmath-unittests,$(USEMODULE))) - INCLUDES += -I$(PKG_BUILDDIR)/unittests + INCLUDES += -I$(PKG_SOURCE_DIR)/unittests endif diff --git a/pkg/libhydrogen/Makefile b/pkg/libhydrogen/Makefile index 5ff4da7f5d..2a7ae323fc 100644 --- a/pkg/libhydrogen/Makefile +++ b/pkg/libhydrogen/Makefile @@ -9,4 +9,4 @@ include $(RIOTBASE)/pkg/pkg.mk CFLAGS += -Wno-type-limits all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/littlefs/Makefile b/pkg/littlefs/Makefile index c1e0ae5f30..9ff0758834 100644 --- a/pkg/littlefs/Makefile +++ b/pkg/littlefs/Makefile @@ -17,4 +17,4 @@ ifneq ($(DEVELHELP),1) endif all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/littlefs2/Makefile b/pkg/littlefs2/Makefile index 5f3e8b7953..ecbcd6a0e9 100644 --- a/pkg/littlefs2/Makefile +++ b/pkg/littlefs2/Makefile @@ -17,4 +17,4 @@ ifneq ($(DEVELHELP),1) endif all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/lora-serialization/Makefile b/pkg/lora-serialization/Makefile index 5f487a93be..de4bb2e7bf 100644 --- a/pkg/lora-serialization/Makefile +++ b/pkg/lora-serialization/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=LGPLv2.1 include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/lua/Makefile b/pkg/lua/Makefile index 1e955ec638..7ae82a1daf 100644 --- a/pkg/lua/Makefile +++ b/pkg/lua/Makefile @@ -7,4 +7,4 @@ PKG_LICENSE=MIT include $(RIOTBASE)/pkg/pkg.mk all: Makefile.lua - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.lua + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(CURDIR)/Makefile.lua diff --git a/pkg/lvgl/Makefile b/pkg/lvgl/Makefile index 9048f21aa4..198fe02994 100644 --- a/pkg/lvgl/Makefile +++ b/pkg/lvgl/Makefile @@ -20,4 +20,4 @@ LVGL_MODULES = \ all: $(LVGL_MODULES) lvgl_%: - MODULE=$@ "$(MAKE)" -C $(PKG_BUILDDIR)/src/lv_$* -f $(CURDIR)/Makefile.lvgl_module + MODULE=$@ "$(MAKE)" -C $(PKG_SOURCE_DIR)/src/lv_$* -f $(CURDIR)/Makefile.lvgl_module diff --git a/pkg/lwip/Makefile b/pkg/lwip/Makefile index 17b751d190..2406242f11 100644 --- a/pkg/lwip/Makefile +++ b/pkg/lwip/Makefile @@ -15,30 +15,30 @@ LWIP_MODULE_MAKEFILE = $(RIOTBASE)/Makefile.base CFLAGS += -Wno-address -make_module = "$(MAKE)" -f $(LWIP_MODULE_MAKEFILE) MODULE=$(1) -C $(2) +make_module = "$(MAKE)" -C $(2) -f $(LWIP_MODULE_MAKEFILE) MODULE=$(1) all: lwip lwip: $(LWIP_USEMODULE) - $(call make_module,$@,$(PKG_BUILDDIR)) + $(call make_module,$@,$(PKG_SOURCE_DIR)) lwip_api: - $(call make_module,$@,$(PKG_BUILDDIR)/src/api) + $(call make_module,$@,$(PKG_SOURCE_DIR)/src/api) lwip_core: - $(call make_module,$@,$(PKG_BUILDDIR)/src/core) + $(call make_module,$@,$(PKG_SOURCE_DIR)/src/core) lwip_ipv4: - $(call make_module,$@,$(PKG_BUILDDIR)/src/core/ipv4) + $(call make_module,$@,$(PKG_SOURCE_DIR)/src/core/ipv4) lwip_ipv6: - $(call make_module,$@,$(PKG_BUILDDIR)/src/core/ipv6) + $(call make_module,$@,$(PKG_SOURCE_DIR)/src/core/ipv6) lwip_netif: - $(call make_module,$@,$(PKG_BUILDDIR)/src/netif) + $(call make_module,$@,$(PKG_SOURCE_DIR)/src/netif) lwip_netif_ppp: - $(call make_module,$@,$(PKG_BUILDDIR)/src/netif/ppp) + $(call make_module,$@,$(PKG_SOURCE_DIR)/src/netif/ppp) lwip_polarssl: - $(call make_module,$@,$(PKG_BUILDDIR)/src/netif/ppp/polarssl) + $(call make_module,$@,$(PKG_SOURCE_DIR)/src/netif/ppp/polarssl) diff --git a/pkg/micro-ecc/Makefile b/pkg/micro-ecc/Makefile index 48ed480be8..4640effdfb 100644 --- a/pkg/micro-ecc/Makefile +++ b/pkg/micro-ecc/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=BSD-2-Clause include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/microcoap/Makefile b/pkg/microcoap/Makefile index 1ad54e67a4..f10ba47ba7 100644 --- a/pkg/microcoap/Makefile +++ b/pkg/microcoap/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=MIT include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) + "$(MAKE)" -C $(PKG_SOURCE_DIR) diff --git a/pkg/minmea/Makefile b/pkg/minmea/Makefile index 6744c994ab..4cd39be38d 100644 --- a/pkg/minmea/Makefile +++ b/pkg/minmea/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=WTFPL include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(CURDIR)/Makefile.$(PKG_NAME) diff --git a/pkg/monocypher/Makefile b/pkg/monocypher/Makefile index a9b0657b3a..a1c8ce68c7 100644 --- a/pkg/monocypher/Makefile +++ b/pkg/monocypher/Makefile @@ -8,7 +8,7 @@ include $(RIOTBASE)/pkg/pkg.mk CFLAGS += -DBLAKE2_NO_UNROLLING all: $(filter monocypher_optional,$(USEMODULE)) - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) monocypher_optional: - "$(MAKE)" -C $(PKG_BUILDDIR)/src/optional -f $(RIOTBASE)/Makefile.base MODULE=$@ + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src/optional -f $(RIOTBASE)/Makefile.base MODULE=$@ diff --git a/pkg/nanocbor/Makefile b/pkg/nanocbor/Makefile index 11330c00bf..854f1f8120 100644 --- a/pkg/nanocbor/Makefile +++ b/pkg/nanocbor/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE = LGPL-2.1 include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) diff --git a/pkg/nanopb/Makefile b/pkg/nanopb/Makefile index 2d17f3e008..f31c7d5569 100644 --- a/pkg/nanopb/Makefile +++ b/pkg/nanopb/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=MIT include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/ndn-riot/Makefile b/pkg/ndn-riot/Makefile index 81a133631e..2ac877fcf3 100644 --- a/pkg/ndn-riot/Makefile +++ b/pkg/ndn-riot/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=LGPLv2.1 include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) + "$(MAKE)" -C $(PKG_SOURCE_DIR) diff --git a/pkg/nimble/Makefile b/pkg/nimble/Makefile index f016dfddba..d2e94311e7 100644 --- a/pkg/nimble/Makefile +++ b/pkg/nimble/Makefile @@ -6,7 +6,7 @@ PKG_LICENSE = Apache-2.0 include $(RIOTBASE)/pkg/pkg.mk TDIR = $(RIOTPKG)/$(PKG_NAME) -PDIR = $(PKG_BUILDDIR) +PDIR = $(PKG_SOURCE_DIR) # NimBLE is not optimized for building with all (extra) warnings enabled. So for # now, we disable a number of selected compiler warnings when building NimBLE. diff --git a/pkg/qDSA/Makefile b/pkg/qDSA/Makefile index 7651801db3..e04932a939 100644 --- a/pkg/qDSA/Makefile +++ b/pkg/qDSA/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=PD include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/$(QDSA_IMPL) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/$(QDSA_IMPL) diff --git a/pkg/qcbor/Makefile b/pkg/qcbor/Makefile index 31110e7e1e..a995413d6a 100644 --- a/pkg/qcbor/Makefile +++ b/pkg/qcbor/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE = BSD-3-Clause include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) diff --git a/pkg/semtech-loramac/Makefile b/pkg/semtech-loramac/Makefile index 96c36e9e52..f65894421c 100644 --- a/pkg/semtech-loramac/Makefile +++ b/pkg/semtech-loramac/Makefile @@ -22,4 +22,4 @@ DIR_loramac_region = mac/region all: $(LORAMAC_MODULES) loramac_%: - "$(MAKE)" -C $(PKG_BUILDDIR)/src/$(DIR_$@) -f $(CURDIR)/Makefile.$@ + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src/$(DIR_$@) -f $(CURDIR)/Makefile.$@ diff --git a/pkg/spiffs/Makefile b/pkg/spiffs/Makefile index b7501e76ed..8c1ba90d2d 100644 --- a/pkg/spiffs/Makefile +++ b/pkg/spiffs/Makefile @@ -9,4 +9,4 @@ include $(RIOTBASE)/pkg/pkg.mk CFLAGS += -Wno-pedantic all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) diff --git a/pkg/talking_leds/Makefile b/pkg/talking_leds/Makefile index 2d5b38c8a3..344b982d63 100644 --- a/pkg/talking_leds/Makefile +++ b/pkg/talking_leds/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=MIT include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) diff --git a/pkg/tensorflow-lite/Makefile b/pkg/tensorflow-lite/Makefile index 945b0bfb43..6d029d8353 100644 --- a/pkg/tensorflow-lite/Makefile +++ b/pkg/tensorflow-lite/Makefile @@ -17,13 +17,13 @@ CFLAGS += -DTF_LITE_USE_GLOBAL_ROUND all: tensorflow-lite tensorflow-lite: $(TF_USEMODULE) - "$(MAKE)" -C $(PKG_BUILDDIR)/tensorflow/lite/c -f $(CURDIR)/Makefile.$(PKG_NAME)-c - "$(MAKE)" -C $(PKG_BUILDDIR)/tensorflow/lite/core/api -f $(CURDIR)/Makefile.$(PKG_NAME)-core - "$(MAKE)" -C $(PKG_BUILDDIR)/tensorflow/lite/kernels -f $(CURDIR)/Makefile.$(PKG_NAME)-kernels - "$(MAKE)" -C $(PKG_BUILDDIR)/tensorflow/lite/kernels/internal -f $(CURDIR)/Makefile.$(PKG_NAME)-kernels-internal - "$(MAKE)" -C $(PKG_BUILDDIR)/tensorflow/lite/micro/kernels -f $(CURDIR)/Makefile.$(PKG_NAME)-micro-kernels - "$(MAKE)" -C $(PKG_BUILDDIR)/tensorflow/lite/micro/memory_planner -f $(CURDIR)/Makefile.$(PKG_NAME)-memory - "$(MAKE)" -C $(PKG_BUILDDIR)/tensorflow/lite/micro -f $(CURDIR)/Makefile.$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/tensorflow/lite/c -f $(CURDIR)/Makefile.$(PKG_NAME)-c + "$(MAKE)" -C $(PKG_SOURCE_DIR)/tensorflow/lite/core/api -f $(CURDIR)/Makefile.$(PKG_NAME)-core + "$(MAKE)" -C $(PKG_SOURCE_DIR)/tensorflow/lite/kernels -f $(CURDIR)/Makefile.$(PKG_NAME)-kernels + "$(MAKE)" -C $(PKG_SOURCE_DIR)/tensorflow/lite/kernels/internal -f $(CURDIR)/Makefile.$(PKG_NAME)-kernels-internal + "$(MAKE)" -C $(PKG_SOURCE_DIR)/tensorflow/lite/micro/kernels -f $(CURDIR)/Makefile.$(PKG_NAME)-micro-kernels + "$(MAKE)" -C $(PKG_SOURCE_DIR)/tensorflow/lite/micro/memory_planner -f $(CURDIR)/Makefile.$(PKG_NAME)-memory + "$(MAKE)" -C $(PKG_SOURCE_DIR)/tensorflow/lite/micro -f $(CURDIR)/Makefile.$(PKG_NAME) tensorflow-lite-%: - "$(MAKE)" -C $(PKG_BUILDDIR)/tensorflow/lite/micro/examples/$* -f $(CURDIR)/Makefile.$(PKG_NAME)-$* + "$(MAKE)" -C $(PKG_SOURCE_DIR)/tensorflow/lite/micro/examples/$* -f $(CURDIR)/Makefile.$(PKG_NAME)-$* diff --git a/pkg/tiny-asn1/Makefile b/pkg/tiny-asn1/Makefile index c239a75db6..e7b34cf333 100644 --- a/pkg/tiny-asn1/Makefile +++ b/pkg/tiny-asn1/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE = LGPL-3 include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) diff --git a/pkg/tinycbor/Makefile b/pkg/tinycbor/Makefile index fbba4605ef..4531d4a416 100644 --- a/pkg/tinycbor/Makefile +++ b/pkg/tinycbor/Makefile @@ -7,4 +7,4 @@ PKG_LICENSE=MIT include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.tinycbor + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(CURDIR)/Makefile.tinycbor diff --git a/pkg/tinycrypt/Makefile b/pkg/tinycrypt/Makefile index 0961e1274a..5096fb8fea 100644 --- a/pkg/tinycrypt/Makefile +++ b/pkg/tinycrypt/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=BSD-3-Clause include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR)/lib/source/ -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/lib/source/ -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME) diff --git a/pkg/tinydtls/Makefile b/pkg/tinydtls/Makefile index 1d80257018..16fd3420c7 100644 --- a/pkg/tinydtls/Makefile +++ b/pkg/tinydtls/Makefile @@ -11,9 +11,9 @@ CFLAGS += -Wno-implicit-fallthrough CFLAGS += -D_XOPEN_SOURCE=600 all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(PKG_BUILDDIR)/Makefile.riot - "$(MAKE)" -C $(PKG_BUILDDIR)/aes -f $(PKG_BUILDDIR)/aes/Makefile.riot - "$(MAKE)" -C $(PKG_BUILDDIR)/ecc -f $(PKG_BUILDDIR)/ecc/Makefile.riot + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(PKG_SOURCE_DIR)/Makefile.riot + "$(MAKE)" -C $(PKG_SOURCE_DIR)/aes -f $(PKG_SOURCE_DIR)/aes/Makefile.riot + "$(MAKE)" -C $(PKG_SOURCE_DIR)/ecc -f $(PKG_SOURCE_DIR)/ecc/Makefile.riot ifeq (llvm,$(TOOLCHAIN)) CFLAGS += -Wno-format-nonliteral diff --git a/pkg/tlsf/Makefile b/pkg/tlsf/Makefile index fdb18c1fb3..aa93310252 100644 --- a/pkg/tlsf/Makefile +++ b/pkg/tlsf/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=BSD include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/tweetnacl/Makefile b/pkg/tweetnacl/Makefile index ce7d68dbae..36d9dbf5df 100644 --- a/pkg/tweetnacl/Makefile +++ b/pkg/tweetnacl/Makefile @@ -6,4 +6,4 @@ PKG_LICENSE=PD include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/u8g2/Makefile b/pkg/u8g2/Makefile index eda88604b5..b4e32aab7a 100644 --- a/pkg/u8g2/Makefile +++ b/pkg/u8g2/Makefile @@ -6,7 +6,7 @@ PKG_LICENSE=BSD-2-Clause include $(RIOTBASE)/pkg/pkg.mk all: $(filter u8g2_%,$(filter-out u8g2_csrc%, $(USEMODULE))) - "$(MAKE)" -C $(PKG_BUILDDIR)/csrc -f $(CURDIR)/Makefile.$(PKG_NAME)_csrc + "$(MAKE)" -C $(PKG_SOURCE_DIR)/csrc -f $(CURDIR)/Makefile.$(PKG_NAME)_csrc u8g2_%: - "$(MAKE)" -C $(PKG_BUILDDIR)/sys/$*/common -f $(CURDIR)/Makefile.$(PKG_NAME)_$* + "$(MAKE)" -C $(PKG_SOURCE_DIR)/sys/$*/common -f $(CURDIR)/Makefile.$(PKG_NAME)_$* diff --git a/pkg/ubasic/Makefile b/pkg/ubasic/Makefile index b054cb66ed..2aea8b247e 100644 --- a/pkg/ubasic/Makefile +++ b/pkg/ubasic/Makefile @@ -15,7 +15,7 @@ all: ubasic make_module = "$(MAKE)" -f $(RIOTPKG)/ubasic/$(1).mk -C $(2) ubasic: $(UBASIC_USEMODULE) - $(call make_module,$@,$(PKG_BUILDDIR)) + $(call make_module,$@,$(PKG_SOURCE_DIR)) ubasic%: - $(call make_module,$@,$(PKG_BUILDDIR)) + $(call make_module,$@,$(PKG_SOURCE_DIR)) diff --git a/pkg/ucglib/Makefile b/pkg/ucglib/Makefile index 8731e57efa..1ca2131c0b 100644 --- a/pkg/ucglib/Makefile +++ b/pkg/ucglib/Makefile @@ -8,8 +8,8 @@ include $(RIOTBASE)/pkg/pkg.mk .PHONY: ucglib_sdl all: $(filter ucglib_sdl,$(USEMODULE)) - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.ucglib - "$(MAKE)" -C $(PKG_BUILDDIR)/csrc -f $(CURDIR)/Makefile.ucglib_csrc + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(CURDIR)/Makefile.ucglib + "$(MAKE)" -C $(PKG_SOURCE_DIR)/csrc -f $(CURDIR)/Makefile.ucglib_csrc ucglib_sdl: - "$(MAKE)" -C $(PKG_BUILDDIR)/sys/sdl/dev -f $(CURDIR)/Makefile.ucglib_sdl + "$(MAKE)" -C $(PKG_SOURCE_DIR)/sys/sdl/dev -f $(CURDIR)/Makefile.ucglib_sdl diff --git a/pkg/umorse/Makefile b/pkg/umorse/Makefile index 7850912cd9..cd3c8fd13d 100644 --- a/pkg/umorse/Makefile +++ b/pkg/umorse/Makefile @@ -8,4 +8,4 @@ include $(RIOTBASE)/pkg/pkg.mk CFLAGS += -D_XOPEN_SOURCE=600 all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base diff --git a/pkg/utensor/Makefile b/pkg/utensor/Makefile index ecaa66b2e1..0056a3c863 100644 --- a/pkg/utensor/Makefile +++ b/pkg/utensor/Makefile @@ -3,11 +3,9 @@ PKG_URL=https://github.com/uTensor/uTensor PKG_VERSION=b22aa5cbc1ef1b3dd42a899b393a9b999afd1305 PKG_LICENSE=Apache2.0 -PKG_BASEDIR = $(PKG_BUILDDIR)/src/uTensor - include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" -C $(PKG_BASEDIR)/core -f $(CURDIR)/Makefile.$(PKG_NAME) - "$(MAKE)" -C $(PKG_BASEDIR)/util -f $(CURDIR)/Makefile.$(PKG_NAME).util - "$(MAKE)" -C $(PKG_BASEDIR)/ops -f $(CURDIR)/Makefile.$(PKG_NAME).ops + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src/uTensor/core -f $(CURDIR)/Makefile.$(PKG_NAME) + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src/uTensor/util -f $(CURDIR)/Makefile.$(PKG_NAME).util + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src/uTensor/ops -f $(CURDIR)/Makefile.$(PKG_NAME).ops diff --git a/pkg/wakaama/Makefile b/pkg/wakaama/Makefile index 457d3d9f36..0238324760 100644 --- a/pkg/wakaama/Makefile +++ b/pkg/wakaama/Makefile @@ -6,6 +6,6 @@ PKG_LICENSE=EDL-1.0,EPL-1.0 include $(RIOTBASE)/pkg/pkg.mk all: - "$(MAKE)" MODULE=wakaama_core -C $(PKG_BUILDDIR)/core -f $(RIOTBASE)/Makefile.base - "$(MAKE)" MODULE=wakaama_core_coap13 -C $(PKG_BUILDDIR)/core/er-coap-13 -f $(RIOTBASE)/Makefile.base - "$(MAKE)" -C $(PKG_BUILDDIR)/examples/client -f $(CURDIR)/wakaama_client.mk + "$(MAKE)" -C $(PKG_SOURCE_DIR)/core -f $(RIOTBASE)/Makefile.base MODULE=wakaama_core + "$(MAKE)" -C $(PKG_SOURCE_DIR)/core/er-coap-13 -f $(RIOTBASE)/Makefile.base MODULE=wakaama_core_coap13 + "$(MAKE)" -C $(PKG_SOURCE_DIR)/examples/client -f $(CURDIR)/wakaama_client.mk diff --git a/pkg/wolfssl/Makefile b/pkg/wolfssl/Makefile index 86000a4dd9..73a5d2d7d4 100644 --- a/pkg/wolfssl/Makefile +++ b/pkg/wolfssl/Makefile @@ -8,10 +8,10 @@ include $(RIOTBASE)/pkg/pkg.mk .PHONY: wolfcrypt% all: $(filter wolfcrypt wolfcrypt-test wolfcrypt-benchmark,$(USEMODULE)) - "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.wolfssl + "$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(CURDIR)/Makefile.wolfssl wolfcrypt: - "$(MAKE)" -C $(PKG_BUILDDIR)/wolfcrypt/src -f $(CURDIR)/Makefile.wolfcrypt + "$(MAKE)" -C $(PKG_SOURCE_DIR)/wolfcrypt/src -f $(CURDIR)/Makefile.wolfcrypt wolfcrypt-%: - "$(MAKE)" -C $(PKG_BUILDDIR)/wolfcrypt/$* -f $(CURDIR)/Makefile.wolfcrypt-$* + "$(MAKE)" -C $(PKG_SOURCE_DIR)/wolfcrypt/$* -f $(CURDIR)/Makefile.wolfcrypt-$* diff --git a/pkg/wolfssl/Makefile.include b/pkg/wolfssl/Makefile.include index cbf77e23b8..be4818993f 100644 --- a/pkg/wolfssl/Makefile.include +++ b/pkg/wolfssl/Makefile.include @@ -1,7 +1,7 @@ CFLAGS += -DWOLFSSL_USER_SETTINGS=1 CFLAGS += -DWOLFSSL_RIOT_OS=1 -INCLUDES += -I$(PKGDIRBASE)/../../../ +INCLUDES += -I$(APPDIR) INCLUDES += -I$(PKGDIRBASE)/wolfssl INCLUDES += -I$(RIOTBASE)/pkg/wolfssl/sock_tls INCLUDES += -I$(RIOTBASE)/pkg/wolfssl/include diff --git a/pkg/yxml/Makefile b/pkg/yxml/Makefile index 8a800621dc..6987acc258 100644 --- a/pkg/yxml/Makefile +++ b/pkg/yxml/Makefile @@ -8,4 +8,4 @@ include $(RIOTBASE)/pkg/pkg.mk CFLAGS += -Wno-unused-parameter all: - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base + "$(MAKE)" -C $(PKG_SOURCE_DIR) -f $(RIOTBASE)/Makefile.base