From 24552e91a4f68cd15d944c09c2a7a8d7d7e2183c Mon Sep 17 00:00:00 2001
From: Attila BODY <attila.body@gmail.com>
Date: Mon, 16 Dec 2019 11:20:59 +0100
Subject: [PATCH] cleaning up the build

---
 .gitignore                                    |  4 +--
 .project                                      |  2 +-
 ...=> mississippi-mcu-packetusart-testbed.ioc |  4 +--
 platforms/firmware/component.mk               | 19 -------------
 platforms/test/component.mk                   |  4 +--
 tests.mk                                      | 27 ++++++++++---------
 6 files changed, 20 insertions(+), 40 deletions(-)
 rename f407ve_packetusart_c.ioc => mississippi-mcu-packetusart-testbed.ioc (99%)

diff --git a/.gitignore b/.gitignore
index 31d067e..253848a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 _[Bb][Uu][Ii][Ll][Dd]*/
-/[Bb][Uu][Ii][Ll][Dd]/
-_[Tt][Ee][Ss][Tt]*/
-/[Tt][Ee][Ss][Tt]/
+/[Bb][Uu][Ii][Ll][Dd]*/
 [Dd]ebug/
 [Rr]elease/
 *.[Bb][Aa][Kk]
diff --git a/.project b/.project
index 69d8816..ea2c129 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>f407ve_packetusart_c</name>
+	<name>mississippi-mcu-packetusart-testbed</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/f407ve_packetusart_c.ioc b/mississippi-mcu-packetusart-testbed.ioc
similarity index 99%
rename from f407ve_packetusart_c.ioc
rename to mississippi-mcu-packetusart-testbed.ioc
index 32266e3..127981e 100644
--- a/f407ve_packetusart_c.ioc
+++ b/mississippi-mcu-packetusart-testbed.ioc
@@ -312,8 +312,8 @@ ProjectManager.MainLocation=Src
 ProjectManager.NoMain=false
 ProjectManager.PreviousToolchain=STM32CubeIDE
 ProjectManager.ProjectBuild=false
-ProjectManager.ProjectFileName=f407ve_packetusart_c.ioc
-ProjectManager.ProjectName=f407ve_packetusart_c
+ProjectManager.ProjectFileName=mississippi-mcu-packetusart-testbed.ioc
+ProjectManager.ProjectName=mississippi-mcu-packetusart-testbed
 ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=STM32CubeIDE
 ProjectManager.ToolChainLocation=
diff --git a/platforms/firmware/component.mk b/platforms/firmware/component.mk
index cd93c54..c7741b4 100644
--- a/platforms/firmware/component.mk
+++ b/platforms/firmware/component.mk
@@ -6,24 +6,5 @@ endif
 #$(eval C_SOURCES += $(wildcard $(REL_DIR)/*.c))
 $(eval COMMON_INCLUDES += -I$(REL_DIR))
 ifeq ($(MKDBG), 1)
- $(info $$C_SOURCES is [${C_SOURCES}])
- $(info )
- $(info $$CXX_SOURCES is [${CXX_SOURCES}])
- $(info )
- $(info $$COMMON_DEFS is [${COMMON_DEFS}])
- $(info )
- $(info $$C_DEFS is [${C_DEFS}])
- $(info )
- $(info $$CXX_DEFS is [${CXX_DEFS}])
- $(info )
- $(info $$COMMON_INCLUDES is [${COMMON_INCLUDES}])
- $(info )
- $(info $$C_INCLUDES is [${C_INCLUDES}])
- $(info )
- $(info $$CXX_INCLUDES is [${CXX_INCLUDES}])
- $(info )
- $(info $$CFLAGS is [${CFLAGS}])
- $(info )
- $(info $$CXXFLAGS is [${CXXFLAGS}])
 $(info <<<)
 endif
diff --git a/platforms/test/component.mk b/platforms/test/component.mk
index ea918a9..8e1c119 100644
--- a/platforms/test/component.mk
+++ b/platforms/test/component.mk
@@ -7,9 +7,7 @@ $(eval C_SOURCES += $(wildcard $(REL_DIR)/platform/*.c))
 $(eval COMMON_INCLUDES += -I$(REL_DIR) -I$(REL_DIR)/gtest_i386/include)
 $(eval LIBDIR += -L$(REL_DIR)/gtest_i386/lib)
 $(eval LIBS += -lgtest -lgtest_main -lpthread)
-$(eval COMPONENT_DEPS += gtest_build)
-
-gtest_build: | $(REL_DIR)/gtest_i386
+$(eval COMPONENT_DEPS += $(REL_DIR)/gtest_i386)
 
 $(REL_DIR)/gtest_i386:
 	$(REL_DIR)/build-googletest.sh gtest_i386
diff --git a/tests.mk b/tests.mk
index b46d008..a5d8244 100644
--- a/tests.mk
+++ b/tests.mk
@@ -13,7 +13,8 @@
 ######################################
 # target
 ######################################
-TARGET = f407ve_packetusart_c_test
+TARGET = mississippi-mcu-packetusart-testbed
+COMPONENT_DEPS =
 
 ######################################
 # building variables
@@ -30,7 +31,7 @@ CXXSTD = -std=c++0x
 # paths
 #######################################
 # Build path
-BUILD_DIR = test
+BUILD_DIR = build_tests
 COMPONENTS = components
 PLATFORMS = platforms
 PLATFORM = test
@@ -109,6 +110,12 @@ ASFLAGS = $(CPU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall
 CFLAGS = $(CPU) $(COMMON_DEFS) $(C_DEFS) $(COMMON_INCLUDES) $(C_INCLUDES) $(OPT) -Wall
 CXXFLAGS = $(CPU) $(COMMON_DEFS) $(CXX_DEFS) $(COMMON_INCLUDES) $(CXX_INCLUDES) $(OPT) $(CXXSTD) -Wall
 
+# default action: build all
+.PONY: all clean
+
+all: $(BUILD_DIR)/$(TARGET)
+
+
 #######################################
 # components
 #######################################
@@ -158,15 +165,11 @@ ifeq ($(MKDBG), 1)
  $(info $$LIBDIR is [${LIBDIR}])
  $(info )
  $(info $$LIBS is [${LIBS}])
+ $(info )
+ $(info $$COMPONENT_DEPS is [${COMPONENT_DEPS}])
  $(info <<--------------------------------------------)
 endif
 
-# default action: build all
-.PONY: all clean
-
-all: $(BUILD_DIR)/$(TARGET)
-
-
 #######################################
 # build the application
 #######################################
@@ -181,15 +184,15 @@ vpath %.s $(sort $(dir $(ASM_SOURCES)))
 OBJECTS +=$(addprefix $(BUILD_DIR)/,$(CXX_SOURCES:.cpp=.o))
 vpath %.cpp $(sort $(dir $(CXX_SOURCES)))
 
-$(BUILD_DIR)/%.o: %.c Makefile firmware.mk | $(BUILD_DIR)
+$(BUILD_DIR)/%.o: %.c Makefile firmware.mk $(COMPONENT_DEPS) | $(BUILD_DIR)
 	mkdir -p $(@D)
 	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(<:.c=.lst) $< -o $@
 
-$(BUILD_DIR)/%.o: %.cpp Makefile firmware.mk | $(BUILD_DIR) 
+$(BUILD_DIR)/%.o: %.cpp Makefile firmware.mk $(COMPONENT_DEPS) | $(BUILD_DIR) 
 	mkdir -p $(@D)
 	$(CXXC) -c $(CXXFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(<:.cpp=.lst) $< -o $@
 
-$(BUILD_DIR)/%.o: %.s Makefile firmware.mk | $(BUILD_DIR)
+$(BUILD_DIR)/%.o: %.s Makefile firmware.mk $(COMPONENT_DEPS) | $(BUILD_DIR)
 	mkdir -p $(@D)
 	$(AS) -c $(CFLAGS) $< -o $@
 
@@ -211,4 +214,4 @@ clean:
 #######################################
 -include $(wildcard $(BUILD_DIR)/*.d)
 
-# *** EOF ***
\ No newline at end of file
+# *** EOF ***