pkg: use Makefile.base to build pkg modules when possible

2020-06-12 16:49:12 +02:00 · 2020-06-12 16:49:12 +02:00 · a009684336
commit a009684336
parent b76bf294ec
44 changed files with 57 additions and 134 deletions
--- a/pkg/c25519/Makefile
+++ b/pkg/c25519/Makefile
@ -17,7 +17,7 @@ endif
 prepare: $(PKG_BUILDDIR)/
 all: $(PKG_BUILDDIR)/
-	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.c25519
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)
 $(PKG_BUILDDIR)/: $(PKGDIRBASE)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT)
 	test "$(PKG_SHA512)  $(PKG_ZIPFILE)" =  "$$(sha512sum "${PKG_ZIPFILE}")"
--- a/pkg/c25519/Makefile.c25519
+++ b/pkg/c25519/Makefile.c25519
@ -1,11 +0,0 @@
 MODULE := c25519
 SRC += c25519.c
 SRC += ed25519.c
 SRC += edsign.c
 SRC += f25519.c
 SRC += fprime.c
 SRC += morph25519.c
 SRC += sha512.c
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/cayenne-lpp/Makefile.cayenne-lpp
+++ b/pkg/cayenne-lpp/Makefile.cayenne-lpp
@ -1,3 +0,0 @@
 MODULE = cayenne-lpp
 include $(RIOTBASE)/Makefile.base
--- a/pkg/cn-cbor/Makefile
+++ b/pkg/cn-cbor/Makefile
@ -5,5 +5,8 @@ PKG_LICENSE=MIT
 include $(RIOTBASE)/pkg/pkg.mk
 # Enable code forcing aligned reads
 CFLAGS += -DCBOR_ALIGN_READS
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.cn-cbor
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)
--- a/pkg/cn-cbor/Makefile.cn-cbor
+++ b/pkg/cn-cbor/Makefile.cn-cbor
@ -1,6 +0,0 @@
 MODULE := cn-cbor
 # Enable code forcing aligned reads
 CFLAGS += -DCBOR_ALIGN_READS
 include $(RIOTBASE)/Makefile.base
--- a/pkg/driver_bme680/Makefile
+++ b/pkg/driver_bme680/Makefile
@ -5,7 +5,11 @@ PKG_LICENSE=BSD-3-Clause
 include $(RIOTBASE)/pkg/pkg.mk
 ifneq (,$(filter bme680_fp,$(USEMODULE)))
  CFLAGS += -DBME680_FLOAT_POINT_COMPENSATION
 endif
 .PHONY: all
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/driver_bme680/Makefile.driver_bme680
+++ b/pkg/driver_bme680/Makefile.driver_bme680
@ -1,7 +0,0 @@
 MODULE = driver_bme680
 ifneq (,$(filter bme680_fp,$(USEMODULE)))
  CFLAGS += -DBME680_FLOAT_POINT_COMPENSATION
 endif
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/fatfs/Makefile.fatfs
+++ b/pkg/fatfs/Makefile.fatfs
@ -1,3 +0,0 @@
 MODULE=fatfs
 include $(RIOTBASE)/Makefile.base
--- a/pkg/hacl/Makefile
+++ b/pkg/hacl/Makefile
@ -5,5 +5,7 @@ PKG_LICENSE=MIT
 include $(RIOTBASE)/pkg/pkg.mk
 CFLAGS += -DKRML_NOUINT128 -Wno-unused-parameter
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/hacl/Makefile.hacl
+++ b/pkg/hacl/Makefile.hacl
@ -1,5 +0,0 @@
 MODULE=hacl
 include $(RIOTBASE)/Makefile.base
 CFLAGS += -DKRML_NOUINT128 -Wno-unused-parameter
--- 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 $(CURDIR)/Makefile.jsmn
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/jsmn/Makefile.jsmn
+++ b/pkg/jsmn/Makefile.jsmn
@ -1,3 +0,0 @@
 SRCS := jsmn.c
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.libcose
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)
-	"$(MAKE)" -C $(PKG_BUILDDIR)/src/crypt -f $(CURDIR)/Makefile.libcose_crypt
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src/crypt -f $(CURDIR)/Makefile.$(PKG_NAME)_crypt
--- a/pkg/libcose/Makefile.libcose
+++ b/pkg/libcose/Makefile.libcose
@ -1,3 +0,0 @@
 MODULE := libcose
 include $(RIOTBASE)/Makefile.base
--- a/pkg/libhydrogen/Makefile
+++ b/pkg/libhydrogen/Makefile
@ -9,5 +9,4 @@ include $(RIOTBASE)/pkg/pkg.mk
 CFLAGS += -Wno-type-limits
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR) \
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
 			  -f $(RIOTPKG)/libhydrogen/Makefile.$(PKG_NAME)
--- a/pkg/libhydrogen/Makefile.libhydrogen
+++ b/pkg/libhydrogen/Makefile.libhydrogen
@ -1,3 +0,0 @@
 MODULE = libhydrogen
 include $(RIOTBASE)/Makefile.base
--- a/pkg/littlefs/Makefile
+++ b/pkg/littlefs/Makefile
@ -6,5 +6,15 @@ PKG_LICENSE=Apache-2.0
 include $(RIOTBASE)/pkg/pkg.mk
 CFLAGS += -Wno-format
 # GCC 4.9 bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64480)
 # used by MIPS
 CFLAGS += -Wno-missing-field-initializers
 # Disable debug printing
 ifneq ($(DEVELHELP),1)
  CFLAGS += -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR
 endif
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.littlefs
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/littlefs/Makefile.littlefs
+++ b/pkg/littlefs/Makefile.littlefs
@ -1,13 +0,0 @@
 MODULE := littlefs
 CFLAGS += -Wno-format
 # GCC 4.9 bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64480)
 # used by MIPS
 CFLAGS += -Wno-missing-field-initializers
 # Disable debug printing
 ifneq ($(DEVELHELP),1)
  CFLAGS += -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR
 endif
 include $(RIOTBASE)/Makefile.base
--- a/pkg/littlefs2/Makefile
+++ b/pkg/littlefs2/Makefile
@ -6,5 +6,15 @@ PKG_LICENSE=Apache-2.0
 include $(RIOTBASE)/pkg/pkg.mk
 CFLAGS += -Wno-format
 # GCC 4.9 bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64480)
 # used by MIPS
 CFLAGS += -Wno-missing-field-initializers
 # Disable debug printing
 ifneq ($(DEVELHELP),1)
  CFLAGS += -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR
 endif
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.littlefs2
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/littlefs2/Makefile.littlefs2
+++ b/pkg/littlefs2/Makefile.littlefs2
@ -1,13 +0,0 @@
 MODULE := littlefs2
 CFLAGS += -Wno-format
 # GCC 4.9 bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64480)
 # used by MIPS
 CFLAGS += -Wno-missing-field-initializers
 # Disable debug printing
 ifneq ($(DEVELHELP),1)
  CFLAGS += -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR
 endif
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/lora-serialization/Makefile.lora-serialization
+++ b/pkg/lora-serialization/Makefile.lora-serialization
@ -1,3 +0,0 @@
 MODULE = lora-serialization
 include $(RIOTBASE)/Makefile.base
--- a/pkg/nanocbor/Makefile
+++ b/pkg/nanocbor/Makefile
@ -6,5 +6,4 @@ PKG_LICENSE = LGPL-2.1
 include $(RIOTBASE)/pkg/pkg.mk
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR)/src \
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)
 		-f $(RIOTPKG)/nanocbor/Makefile.$(PKG_NAME)
--- a/pkg/nanocbor/Makefile.nanocbor
+++ b/pkg/nanocbor/Makefile.nanocbor
@ -1,6 +0,0 @@
 MODULE = nanocbor
 SRC = decoder.c \
      encoder.c
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.nanopb
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/nanopb/Makefile.nanopb
+++ b/pkg/nanopb/Makefile.nanopb
@ -1,3 +0,0 @@
 SRCS := pb_encode.c pb_decode.c pb_common.c
 include $(RIOTBASE)/Makefile.base
--- 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 $(RIOTPKG)/qcbor/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)
--- a/pkg/qcbor/Makefile.qcbor
+++ b/pkg/qcbor/Makefile.qcbor
@ -1,3 +0,0 @@
 MODULE = qcbor
 include $(RIOTBASE)/Makefile.base
--- a/pkg/spiffs/Makefile
+++ b/pkg/spiffs/Makefile
@ -5,5 +5,8 @@ PKG_LICENSE=MIT
 include $(RIOTBASE)/pkg/pkg.mk
 # Disable 'ISO C99 doesn’t support unnamed structs/unions [-Werror=pedantic]'
 CFLAGS += -Wno-pedantic
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(CURDIR)/Makefile.spiffs
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)
--- a/pkg/spiffs/Makefile.spiffs
+++ b/pkg/spiffs/Makefile.spiffs
@ -1,6 +0,0 @@
 MODULE := spiffs
 # Disable 'ISO C99 doesn’t support unnamed structs/unions [-Werror=pedantic]'
 CFLAGS += -Wno-pedantic
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.talking_leds
+	"$(MAKE)" -C $(PKG_BUILDDIR)/src -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)
--- a/pkg/talking_leds/Makefile.talking_leds
+++ b/pkg/talking_leds/Makefile.talking_leds
@ -1,3 +0,0 @@
 MODULE = talking_leds
 include $(RIOTBASE)/Makefile.base
--- a/pkg/tinycrypt/Makefile
+++ b/pkg/tinycrypt/Makefile
@ -6,5 +6,4 @@ PKG_LICENSE=BSD-3-Clause
 include $(RIOTBASE)/pkg/pkg.mk
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR)/lib/source/ \
+	"$(MAKE)" -C $(PKG_BUILDDIR)/lib/source/ -f $(RIOTBASE)/Makefile.base MODULE=$(PKG_NAME)
 			  -f $(RIOTPKG)/tinycrypt/Makefile.$(PKG_NAME)
--- a/pkg/tinycrypt/Makefile.tinycrypt
+++ b/pkg/tinycrypt/Makefile.tinycrypt
@ -1,3 +0,0 @@
 MODULE = tinycrypt
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/tlsf/Makefile.tlsf
+++ b/pkg/tlsf/Makefile.tlsf
@ -1,3 +0,0 @@
 MODULE = tlsf
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.riot
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/tweetnacl/Makefile.riot
+++ b/pkg/tweetnacl/Makefile.riot
@ -1,3 +0,0 @@
 MODULE=tweetnacl
 include $(RIOTBASE)/Makefile.base
--- 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 $(CURDIR)/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/umorse/Makefile.umorse
+++ b/pkg/umorse/Makefile.umorse
@ -1,2 +0,0 @@
 SRC := umorse.c print.c
 include $(RIOTBASE)/Makefile.base
--- a/pkg/yxml/Makefile
+++ b/pkg/yxml/Makefile
@ -5,5 +5,7 @@ PKG_LICENSE=MIT
 include $(RIOTBASE)/pkg/pkg.mk
 CFLAGS += -Wno-unused-parameter
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(RIOTBASE)/Makefile.base
--- a/pkg/yxml/Makefile.yxml
+++ b/pkg/yxml/Makefile.yxml
@ -1,3 +0,0 @@
 CFLAGS += -Wno-unused-parameter
 include $(RIOTBASE)/Makefile.base
		`@ -1,3 +0,0 @@`
			`MODULE = cayenne-lpp`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`MODULE=fatfs`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`SRCS := jsmn.c`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`MODULE := libcose`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`MODULE = libhydrogen`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`MODULE = lora-serialization`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`SRCS := pb_encode.c pb_decode.c pb_common.c`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`MODULE = qcbor`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`MODULE = talking_leds`

			`include $(RIOTBASE)/Makefile.base`
		`@ -1,3 +0,0 @@`
			`MODULE = tinycrypt`

			`include $(RIOTBASE)/Makefile.base`