From 29b81e4b40695157aff78c28cf328214c8296e03 Mon Sep 17 00:00:00 2001
From: Leandro Lanzieri <leandro.lanzieri@haw-hamburg.de>
Date: Wed, 12 Aug 2020 15:37:49 +0200
Subject: [PATCH] makefiles/bindist: copy object files and use .bin to compare

---
 makefiles/bindist.inc.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/makefiles/bindist.inc.mk b/makefiles/bindist.inc.mk
index b8b8510e61..3002e95404 100644
--- a/makefiles/bindist.inc.mk
+++ b/makefiles/bindist.inc.mk
@@ -1,7 +1,7 @@
 # Avoid including APPLICATION_MODULE twice to prevent multiple definition errors
 USEMODULE += $(filter-out $(APPLICATION_MODULE),$(BIN_USEMODULE))
 
-DIST_FILES += $(BIN_USEMODULE:%=bin/$(BOARD)/%.a)
+DIST_FILES += $(BIN_USEMODULE:%=bin/$(BOARD)/%/*.o)
 
 # if the file Makefile.distcheck exists, we're executing from within a folder
 # generated by "make bindist".
@@ -17,7 +17,7 @@ bindist: all
 		echo Copying $$i to bindist. ; \
 		cp -a --parents $$i bindist ; \
 		done
-	@cp -a bin/$(BOARD)/$(APPLICATION).elf bindist
+	@cp -a bin/$(BOARD)/$(APPLICATION).bin bindist
 
 	@echo "BINDIST_RIOT_VERSION=$(RIOT_VERSION)" > bindist/Makefile.distcheck
 	@echo "BINDIST_GIT_HEAD=$$(git -C $(RIOTBASE) describe)" >> bindist/Makefile.distcheck
@@ -29,7 +29,7 @@ prepare_check_bindist:
 		echo "Warning! git describe doesn't match!"
 
 check_bindist: prepare_check_bindist all
-	@test $(shell md5sum bin/$(BOARD)/$(APPLICATION).elf | cut -f1 -d\ ) \
-		= $(shell md5sum $(APPLICATION).elf | cut -f1 -d\ ) \
-		&& echo "bin/$(BOARD)/$(APPLICATION).elf matches $(APPLICATION).elf." \
-		|| echo "bin/$(BOARD)/$(APPLICATION).elf and $(APPLICATION).elf don't match!"
+	@test $(shell md5sum bin/$(BOARD)/$(APPLICATION).bin | cut -f1 -d\ ) \
+		= $(shell md5sum $(APPLICATION).bin | cut -f1 -d\ ) \
+		&& echo "bin/$(BOARD)/$(APPLICATION).bin matches $(APPLICATION).bin." \
+		|| echo "bin/$(BOARD)/$(APPLICATION).bin and $(APPLICATION).bin don't match!"