diff --git a/pkg/Makefile.git b/pkg/Makefile.git index 417b1ae318..b9d1251cab 100644 --- a/pkg/Makefile.git +++ b/pkg/Makefile.git @@ -4,7 +4,7 @@ PKG_VERSION= # version of the package to use e.g. a git commit/ref .PHONY: all -all: git-download +all: $(MAKE) -C $(CURDIR)/$(PKG_NAME) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/cayenne-lpp/Makefile b/pkg/cayenne-lpp/Makefile index f89af7e819..4d40db263a 100644 --- a/pkg/cayenne-lpp/Makefile +++ b/pkg/cayenne-lpp/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=LGPLv2.1 .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/cmsis-dsp/Makefile b/pkg/cmsis-dsp/Makefile index b5ace34db1..9cffaff1b8 100644 --- a/pkg/cmsis-dsp/Makefile +++ b/pkg/cmsis-dsp/Makefile @@ -6,7 +6,7 @@ CFLAGS += -Wno-strict-aliasing -Wno-unused-parameter .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/cn-cbor/Makefile b/pkg/cn-cbor/Makefile index 0ff9ac08d6..8646ff563b 100644 --- a/pkg/cn-cbor/Makefile +++ b/pkg/cn-cbor/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=MIT .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.cn-cbor include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/emb6/Makefile b/pkg/emb6/Makefile index 70ba8bb855..d1784a623c 100644 --- a/pkg/emb6/Makefile +++ b/pkg/emb6/Makefile @@ -18,11 +18,11 @@ EMB6_SUBMODULES:=$(filter-out emb6_contrib \ .PHONY: all -all: git-download $(EMB6_SUBMODULES) +all: $(EMB6_SUBMODULES) "$(MAKE)" -C $(PKG_BUILDDIR) # Rule for all submodules -emb6_%: git-download +emb6_%: "$(MAKE)" -C $(dir $(shell grep -lR "MODULE.*=.*\<$@\>" $(PKG_BUILDDIR))) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/fatfs/Makefile b/pkg/fatfs/Makefile index a2ef257868..3bd886723c 100644 --- a/pkg/fatfs/Makefile +++ b/pkg/fatfs/Makefile @@ -6,7 +6,7 @@ MODULE_MAKEFILE := $(CURDIR)/Makefile.fatfs .PHONY: all -all: git-download +all: @cp $(MODULE_MAKEFILE) $(PKG_BUILDDIR)/Makefile "$(MAKE)" -C $(PKG_BUILDDIR) diff --git a/pkg/gecko_sdk/Makefile b/pkg/gecko_sdk/Makefile index 988aad116f..0d5f3b4c9e 100644 --- a/pkg/gecko_sdk/Makefile +++ b/pkg/gecko_sdk/Makefile @@ -13,7 +13,7 @@ endif .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/dist include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/hacl/Makefile b/pkg/hacl/Makefile index 59ffa9408d..330df12a67 100644 --- a/pkg/hacl/Makefile +++ b/pkg/hacl/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=MIT .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/heatshrink/Makefile b/pkg/heatshrink/Makefile index d205e1d4fb..fad15f992e 100644 --- a/pkg/heatshrink/Makefile +++ b/pkg/heatshrink/Makefile @@ -4,7 +4,7 @@ PKG_VERSION=7d419e1fa4830d0b919b9b6a91fe2fb786cf3280 .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.heatshrink include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/jerryscript/Makefile b/pkg/jerryscript/Makefile index 8e76cd979a..b38688db04 100644 --- a/pkg/jerryscript/Makefile +++ b/pkg/jerryscript/Makefile @@ -12,7 +12,7 @@ ifeq ($(TOOLCHAIN)_$(BOARD),llvm_native) CFLAGS += -Wno-macro-redefined -Wno-gnu-folding-constant endif -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.jerryscript all include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/jsmn/Makefile b/pkg/jsmn/Makefile index 17de17fc64..cf53ff653e 100644 --- a/pkg/jsmn/Makefile +++ b/pkg/jsmn/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=MIT .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.jsmn include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/libb2/Makefile b/pkg/libb2/Makefile index 16ac11aae1..83293234af 100644 --- a/pkg/libb2/Makefile +++ b/pkg/libb2/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE = CC0-1.0 .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/src \ -f $(RIOTPKG)/libb2/Makefile.$(PKG_NAME) diff --git a/pkg/libcoap/Makefile b/pkg/libcoap/Makefile index e6cca7fcc5..18b69db159 100644 --- a/pkg/libcoap/Makefile +++ b/pkg/libcoap/Makefile @@ -8,7 +8,7 @@ CFLAGS += -Wno-implicit-fallthrough .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/libcose/Makefile b/pkg/libcose/Makefile index 5771706bb1..5ade5f6c0c 100644 --- a/pkg/libcose/Makefile +++ b/pkg/libcose/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=LGPL .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.libcose "$(MAKE)" -C $(PKG_BUILDDIR)/src/crypt -f $(CURDIR)/Makefile.libcose_crypt diff --git a/pkg/libfixmath/Makefile b/pkg/libfixmath/Makefile index 366719adbd..6f50c031b7 100644 --- a/pkg/libfixmath/Makefile +++ b/pkg/libfixmath/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE := MIT .PHONY: all -all: git-download +all: $(Q)"$(MAKE)" -C $(PKG_BUILDDIR) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/libhydrogen/Makefile b/pkg/libhydrogen/Makefile index 12abf19121..f0284b0446 100644 --- a/pkg/libhydrogen/Makefile +++ b/pkg/libhydrogen/Makefile @@ -8,7 +8,7 @@ CFLAGS += -Wno-type-limits .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) \ -f $(RIOTPKG)/libhydrogen/Makefile.$(PKG_NAME) diff --git a/pkg/littlefs/Makefile b/pkg/littlefs/Makefile index 5509911475..33b7bcd519 100644 --- a/pkg/littlefs/Makefile +++ b/pkg/littlefs/Makefile @@ -6,7 +6,7 @@ PKG_LICENSE=Apache-2.0 .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.littlefs include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/lora-serialization/Makefile b/pkg/lora-serialization/Makefile index e6a9505776..766d7c9686 100644 --- a/pkg/lora-serialization/Makefile +++ b/pkg/lora-serialization/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=LGPLv2.1 .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/lwip/Makefile b/pkg/lwip/Makefile index 33742bdfaa..cb4e34b9d8 100644 --- a/pkg/lwip/Makefile +++ b/pkg/lwip/Makefile @@ -15,7 +15,7 @@ CFLAGS += -Wno-address make_module = "$(MAKE)" -f $(LWIP_MODULE_MAKEFILE) MODULE=$(1) -C $(2) -all: git-download lwip +all: lwip lwip: $(LWIP_USEMODULE) $(call make_module,$@,$(PKG_BUILDDIR)) diff --git a/pkg/micro-ecc/Makefile b/pkg/micro-ecc/Makefile index 64cb18ccac..518e38f707 100644 --- a/pkg/micro-ecc/Makefile +++ b/pkg/micro-ecc/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=BSD-2-Clause .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/microcoap/Makefile b/pkg/microcoap/Makefile index fce23da170..155c8837b0 100644 --- a/pkg/microcoap/Makefile +++ b/pkg/microcoap/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=MIT .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/minmea/Makefile b/pkg/minmea/Makefile index e0ff284407..a919a42b29 100644 --- a/pkg/minmea/Makefile +++ b/pkg/minmea/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=WTFPL .PHONY: all -all: git-download +all: @cp Makefile.$(PKG_NAME) $(PKG_BUILDDIR)/Makefile "$(MAKE)" -C $(PKG_BUILDDIR) diff --git a/pkg/monocypher/Makefile b/pkg/monocypher/Makefile index 797b7fba88..010d96ddd3 100644 --- a/pkg/monocypher/Makefile +++ b/pkg/monocypher/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=CC-0 .PHONY: all -all: git-download +all: $(Q)"$(MAKE)" -C $(PKG_BUILDDIR)/src include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/ndn-riot/Makefile b/pkg/ndn-riot/Makefile index 54c04bba88..a892281ced 100644 --- a/pkg/ndn-riot/Makefile +++ b/pkg/ndn-riot/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=LGPLv2.1 .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/nimble/Makefile b/pkg/nimble/Makefile index b4387d6fb6..80707bb974 100644 --- a/pkg/nimble/Makefile +++ b/pkg/nimble/Makefile @@ -22,7 +22,7 @@ SUBMODS := $(filter nimble_%,$(USEMODULE)) .PHONY: all -all: git-download $(SUBMODS) +all: $(SUBMODS) # blue code and RIOT port modules nimble_riot_contrib: diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile index 09e0bcca5e..6a8bd3a6b3 100644 --- a/pkg/oonf_api/Makefile +++ b/pkg/oonf_api/Makefile @@ -10,7 +10,7 @@ CFLAGS += -Wno-implicit-fallthrough .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR) "$(MAKE)" $(BINDIR)/$(MODULE).a diff --git a/pkg/openthread/Makefile b/pkg/openthread/Makefile index fe2b201c87..500df0d40a 100644 --- a/pkg/openthread/Makefile +++ b/pkg/openthread/Makefile @@ -27,7 +27,7 @@ $(info $$OPENTHREAD_ARGS is [${OPENTHREAD_ARGS}]) OPENTHREAD_COMMON_FLAGS = -fdata-sections -ffunction-sections -Os OPENTHREAD_COMMON_FLAGS += -Wno-implicit-fallthrough -Wno-unused-parameter -all: git-download +all: cd $(PKG_BUILDDIR) && PREFIX="/" ./bootstrap cd $(PKG_BUILDDIR) && CPP="$(CPP)" CC="$(CC)" CXX="$(CXX)"\ OBJC="" OBJCXX="" AR="$(AR)" RANLIB="$(RANLIB)" NM="$(NM)" \ diff --git a/pkg/qDSA/Makefile b/pkg/qDSA/Makefile index 3055a03469..7bb88ae9a0 100644 --- a/pkg/qDSA/Makefile +++ b/pkg/qDSA/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=PD .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/$(QDSA_IMPL) include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/semtech-loramac/Makefile b/pkg/semtech-loramac/Makefile index aab8f6235e..3eb9a007b4 100644 --- a/pkg/semtech-loramac/Makefile +++ b/pkg/semtech-loramac/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=BSD-3-Clause .PHONY: all -all: git-download +all: @cp Makefile.loramac $(PKG_BUILDDIR)/Makefile @cp Makefile.loramac_mac $(PKG_BUILDDIR)/src/mac/Makefile @cp Makefile.loramac_region $(PKG_BUILDDIR)/src/mac/region/Makefile diff --git a/pkg/spiffs/Makefile b/pkg/spiffs/Makefile index 4fd62bdb01..2d95554124 100644 --- a/pkg/spiffs/Makefile +++ b/pkg/spiffs/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=MIT .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.spiffs include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/tiny-asn1/Makefile b/pkg/tiny-asn1/Makefile index 11fb93fed2..e43e99289c 100644 --- a/pkg/tiny-asn1/Makefile +++ b/pkg/tiny-asn1/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE = LGPL-3 .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/src include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/tinycbor/Makefile b/pkg/tinycbor/Makefile index c8b0e04207..d863a53086 100644 --- a/pkg/tinycbor/Makefile +++ b/pkg/tinycbor/Makefile @@ -6,7 +6,7 @@ PKG_LICENSE=MIT .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.tinycbor include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/tinycrypt/Makefile b/pkg/tinycrypt/Makefile index efb90023d0..f7fb9961dd 100644 --- a/pkg/tinycrypt/Makefile +++ b/pkg/tinycrypt/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=BSD-3-Clause .PHONY: all -all: git-download +all: "$(MAKE)" -C $(PKG_BUILDDIR)/lib/source/ \ -f $(RIOTPKG)/tinycrypt/Makefile.$(PKG_NAME) diff --git a/pkg/tinydtls/Makefile b/pkg/tinydtls/Makefile index ac3462e09b..e1a8483d0b 100644 --- a/pkg/tinydtls/Makefile +++ b/pkg/tinydtls/Makefile @@ -10,7 +10,7 @@ CFLAGS += -D_XOPEN_SOURCE=600 .PHONY: all -all: git-download +all: @cp $(PKG_BUILDDIR)/Makefile.riot $(PKG_BUILDDIR)/Makefile @cp $(PKG_BUILDDIR)/aes/Makefile.riot $(PKG_BUILDDIR)/aes/Makefile @cp $(PKG_BUILDDIR)/ecc/Makefile.riot $(PKG_BUILDDIR)/ecc/Makefile diff --git a/pkg/tweetnacl/Makefile b/pkg/tweetnacl/Makefile index c2d1bff57c..f946c4dd75 100644 --- a/pkg/tweetnacl/Makefile +++ b/pkg/tweetnacl/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=PD .PHONY: all -all: git-download +all: $(Q)"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.riot include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/u8g2/Makefile b/pkg/u8g2/Makefile index 310b6b9cb1..53b3bdbb62 100644 --- a/pkg/u8g2/Makefile +++ b/pkg/u8g2/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=BSD-2-Clause .PHONY: all -all: git-download +all: cp $(RIOTBASE)/pkg/u8g2/src/Makefile $(PKG_BUILDDIR)/Makefile cp $(RIOTBASE)/pkg/u8g2/src/csrc/Makefile $(PKG_BUILDDIR)/csrc/Makefile cp $(RIOTBASE)/pkg/u8g2/src/csrc/u8g2_riotos.c $(PKG_BUILDDIR)/csrc/u8g2_riotos.c diff --git a/pkg/ubasic/Makefile b/pkg/ubasic/Makefile index 089d6d36da..73b7f40743 100644 --- a/pkg/ubasic/Makefile +++ b/pkg/ubasic/Makefile @@ -8,7 +8,7 @@ UBASIC_USEMODULE = $(filter $(UBASIC_MODULES),$(USEMODULE)) .PHONY: all ubasic ubasic% -all: git-download ubasic +all: ubasic make_module = "$(MAKE)" -f $(RIOTPKG)/ubasic/$(1).mk -C $(2) diff --git a/pkg/ucglib/Makefile b/pkg/ucglib/Makefile index d6f76fe3cf..898f96e60f 100644 --- a/pkg/ucglib/Makefile +++ b/pkg/ucglib/Makefile @@ -5,7 +5,7 @@ PKG_LICENSE=BSD-2-Clause .PHONY: all -all: git-download +all: cp $(RIOTBASE)/pkg/ucglib/src/Makefile $(PKG_BUILDDIR)/Makefile cp $(RIOTBASE)/pkg/ucglib/src/csrc/Makefile $(PKG_BUILDDIR)/csrc/Makefile cp $(RIOTBASE)/pkg/ucglib/src/csrc/ucg_riotos.c $(PKG_BUILDDIR)/csrc/ucg_riotos.c diff --git a/pkg/umorse/Makefile b/pkg/umorse/Makefile index 394f1d46e0..a4a728bbbe 100644 --- a/pkg/umorse/Makefile +++ b/pkg/umorse/Makefile @@ -7,7 +7,7 @@ CFLAGS += -D_XOPEN_SOURCE=600 .PHONY: all -all: git-download +all: @cp Makefile.umorse $(PKG_BUILDDIR)/Makefile "$(MAKE)" -C $(PKG_BUILDDIR)