riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14249 from aabadie/pr/pkg/tinydtls_make

Browse Source 
pkg/tinydtls: cleanup build system integration
This commit is contained in:
Leandro Lanzieri 2020-06-10 18:32:26 +02:00 committed by GitHub
commit e2f20d647c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/tinydtls/Makefile
View File

@ -11,10 +11,9 @@ CFLAGS += -Wno-implicit-fallthrough
CFLAGS += -D_XOPEN_SOURCE=600 CFLAGS += -D_XOPEN_SOURCE=600
all: all:
@cp $(PKG_BUILDDIR)/Makefile.riot $(PKG_BUILDDIR)/Makefile "$(MAKE)" -C $(PKG_BUILDDIR) -f $(PKG_BUILDDIR)/Makefile.riot
@cp $(PKG_BUILDDIR)/aes/Makefile.riot $(PKG_BUILDDIR)/aes/Makefile "$(MAKE)" -C $(PKG_BUILDDIR)/aes -f $(PKG_BUILDDIR)/aes/Makefile.riot
@cp $(PKG_BUILDDIR)/ecc/Makefile.riot $(PKG_BUILDDIR)/ecc/Makefile "$(MAKE)" -C $(PKG_BUILDDIR)/ecc -f $(PKG_BUILDDIR)/ecc/Makefile.riot
"$(MAKE)" -C $(PKG_BUILDDIR)
ifeq (llvm,$(TOOLCHAIN)) ifeq (llvm,$(TOOLCHAIN))
CFLAGS += -Wno-format-nonliteral CFLAGS += -Wno-format-nonliteral

8
pkg/tinydtls/Makefile.include
View File

@ -41,14 +41,6 @@ else
CFLAGS += -DTINYDTLS_LOG_LVL=0 CFLAGS += -DTINYDTLS_LOG_LVL=0
endif endif
ifneq (,$(filter tinydtls_aes,$(USEMODULE)))
DIRS += $(PKG_BUILDDIR)/aes
endif
ifneq (,$(filter tinydtls_ecc,$(USEMODULE)))
DIRS += $(PKG_BUILDDIR)/ecc
endif
# For now contrib only contains sock_dtls adaption # For now contrib only contains sock_dtls adaption
ifneq (,$(filter tinydtls_sock_dtls,$(USEMODULE))) ifneq (,$(filter tinydtls_sock_dtls,$(USEMODULE)))
DIRS += $(RIOTBASE)/pkg/tinydtls/contrib DIRS += $(RIOTBASE)/pkg/tinydtls/contrib