From a38369aa98ab13306c5f0d4c84d29b8167d9050e Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Wed, 9 May 2018 10:18:45 +0200
Subject: [PATCH] [ion] Revert blackbox's object list

---
 build/targets.blackbox.mak | 7 +++----
 ion/src/blackbox/Makefile  | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/targets.blackbox.mak b/build/targets.blackbox.mak
index c1668c791..277a94bac 100644
--- a/build/targets.blackbox.mak
+++ b/build/targets.blackbox.mak
@@ -1,6 +1,3 @@
-epsilon.$(EXE): $(objs) $(app_objs) $(app_image_objs) $(addprefix ion/src/blackbox/, boot.o events.o)
-
-products += $(addprefix ion/src/blackbox/, boot.o events.o)
 products += $(wildcard ion/src/blackbox/library_*.o)
 
 ion/src/blackbox/library_%.o: SFLAGS += -D EPSILON_LIB_PREFIX=$(*F)
@@ -8,8 +5,10 @@ ion/src/blackbox/library_%.o: ion/src/blackbox/library.cpp
 	@echo "CXX     $@"
 	$(Q) $(CXX) $(SFLAGS) $(CXXFLAGS) -c $< -o $@
 
+libepsilon_objs = $(filter-out $(add-prefix ion/src/blackbox/,boot.o events.o),$(objs))
+
 libepsilon_%.o: LDFLAGS += -exported_symbols_list ion/src/blackbox/lib_export_list.txt
-libepsilon_%.o: $(objs) $(app_objs) $(app_image_objs) ion/src/blackbox/library_%.o
+libepsilon_%.o: $(libepsilon_objs) $(app_objs) $(app_image_objs) ion/src/blackbox/library_%.o
 	@echo "LD      $@"
 	$(Q) $(LD) $^ $(LDFLAGS) -r -s -o $@
 
diff --git a/ion/src/blackbox/Makefile b/ion/src/blackbox/Makefile
index c84301bbd..82d051496 100644
--- a/ion/src/blackbox/Makefile
+++ b/ion/src/blackbox/Makefile
@@ -1,6 +1,8 @@
 objs += $(addprefix ion/src/blackbox/, \
+  boot.o \
   ion.o \
   display.o \
+  events.o \
 )
 
 objs += $(addprefix ion/src/shared/, \