From 6de497a066e22d6ff12b345cbca144ddbfc9afc1 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Wed, 10 Jun 2020 14:17:34 +0200
Subject: [PATCH 1/2] pkg/wakaama: cleanup build system integration

Avoid modifying the cloned repository for each build
---
 pkg/wakaama/Makefile          | 19 +++----------------
 pkg/wakaama/Makefile.dep      |  2 ++
 pkg/wakaama/Makefile.include  |  5 ++++-
 pkg/wakaama/wakaama_client.mk |  9 +++++++++
 4 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 pkg/wakaama/wakaama_client.mk

diff --git a/pkg/wakaama/Makefile b/pkg/wakaama/Makefile
index 551154d1ad..457d3d9f36 100644
--- a/pkg/wakaama/Makefile
+++ b/pkg/wakaama/Makefile
@@ -6,19 +6,6 @@ PKG_LICENSE=EDL-1.0,EPL-1.0
 include $(RIOTBASE)/pkg/pkg.mk
 
 all:
-	"$(MAKE)" -C $(PKG_BUILDDIR)
-
-$(PKG_PREPARED): $(PKG_BUILDDIR)/copied
-$(PKG_BUILDDIR)/copied: $(PKG_PATCHED) FORCE
-	mkdir -p "$(PKG_BUILDDIR)"
-	# copy the Wakaama core files
-	cp $(PKG_BUILDDIR)/core/*.c $(PKG_BUILDDIR)/core/*.h $(PKG_BUILDDIR)
-	# copy the coap implementation from Wakaama
-	cp $(PKG_BUILDDIR)/core/er-coap-13/*.c $(PKG_BUILDDIR)/core/er-coap-13/*.h $(PKG_BUILDDIR)
-	# copy the mandatory objects, implemented on Wakaama examples
-	cp $(PKG_BUILDDIR)/examples/client/object_server.c $(PKG_BUILDDIR)
-	cp $(PKG_BUILDDIR)/examples/client/object_security.c $(PKG_BUILDDIR)
-	cp $(PKG_BUILDDIR)/examples/client/object_access_control.c $(PKG_BUILDDIR)
-
-	echo 'MODULE:=wakaama' > $(PKG_BUILDDIR)/Makefile
-	echo 'include $$(RIOTBASE)/Makefile.base' >> $(PKG_BUILDDIR)/Makefile
\ No newline at end of file
+	"$(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
diff --git a/pkg/wakaama/Makefile.dep b/pkg/wakaama/Makefile.dep
index ece9421cd0..99138fcf4b 100644
--- a/pkg/wakaama/Makefile.dep
+++ b/pkg/wakaama/Makefile.dep
@@ -1,3 +1,5 @@
+USEMODULE += wakaama_core wakaama_core_coap13 wakaama_client
+
 # include contrib code (platform adaption and client implementation)
 USEMODULE += wakaama_contrib
 
diff --git a/pkg/wakaama/Makefile.include b/pkg/wakaama/Makefile.include
index f5e74f55c0..45d623572e 100644
--- a/pkg/wakaama/Makefile.include
+++ b/pkg/wakaama/Makefile.include
@@ -1,7 +1,8 @@
 DIRS += $(RIOTBASE)/pkg/wakaama/contrib
 
 INCLUDES += -I$(RIOTBASE)/pkg/wakaama/include
-INCLUDES += -I$(PKGDIRBASE)/wakaama
+INCLUDES += -I$(PKGDIRBASE)/wakaama/core
+INCLUDES += -I$(PKGDIRBASE)/wakaama/core/er-coap-13
 
 # NOTE: Use wakaama in client mode
 CFLAGS += -DLWM2M_CLIENT_MODE
@@ -15,3 +16,5 @@ endif
 ifneq (,$(or $(CONFIG_LWM2M_WITH_LOGS),$(filter -DCONFIG_LWM2M_WITH_LOGS=1,$(CFLAGS))))
     CFLAGS += -DLWM2M_WITH_LOGS=1
 endif
+
+PSEUDOMODULES += wakaama
diff --git a/pkg/wakaama/wakaama_client.mk b/pkg/wakaama/wakaama_client.mk
new file mode 100644
index 0000000000..6cc649fc29
--- /dev/null
+++ b/pkg/wakaama/wakaama_client.mk
@@ -0,0 +1,9 @@
+MODULE = wakaama_client
+
+SRC =                       \
+    object_server.c         \
+    object_security.c       \
+    object_access_control.c \
+    #
+
+include $(RIOTBASE)/Makefile.base

From 9ebae8e92a44dccf8e603dfd69b516d9555a2a27 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Wed, 10 Jun 2020 14:18:21 +0200
Subject: [PATCH 2/2] pkg/wakaama: fix indentation in Makefile.include

---
 pkg/wakaama/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/wakaama/Makefile.include b/pkg/wakaama/Makefile.include
index 45d623572e..057bb48b72 100644
--- a/pkg/wakaama/Makefile.include
+++ b/pkg/wakaama/Makefile.include
@@ -10,11 +10,11 @@ CFLAGS += -DLWM2M_CLIENT_MODE
 # Translate 'CONFIG_' options to package specific flags. This checks if the
 # option is being set via Kconfig or CFLAGS
 ifneq (,$(or $(CONFIG_LWM2M_BOOTSTRAP),$(filter -DCONFIG_LWM2M_BOOTSTRAP=1,$(CFLAGS))))
-    CFLAGS += -DLWM2M_BOOTSTRAP=1
+  CFLAGS += -DLWM2M_BOOTSTRAP=1
 endif
 
 ifneq (,$(or $(CONFIG_LWM2M_WITH_LOGS),$(filter -DCONFIG_LWM2M_WITH_LOGS=1,$(CFLAGS))))
-    CFLAGS += -DLWM2M_WITH_LOGS=1
+  CFLAGS += -DLWM2M_WITH_LOGS=1
 endif
 
 PSEUDOMODULES += wakaama