[Cryptech-Commits] [sw/stm32] 03/04: sw/stm32 Makefiles are a mess.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch ksng
in repository sw/stm32.

commit 9eb2c8909a1b4602bfd47d6e96ba2229ff393517
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Sat Apr 15 17:16:01 2017 -0400

    sw/stm32 Makefiles are a mess.
    
    Apparently it's easier to duplicate source files into multiple project
    directories than to write Makefiles that do something sane.  Feh.
---
 Makefile                               | 3 +--
 projects/bootloader/Makefile           | 2 +-
 stm-log.c => projects/bootloader/log.c | 4 ++--
 projects/hsm/Makefile                  | 3 ++-
 stm-log.c => projects/hsm/log.c        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 581adda..2944aa9 100644
--- a/Makefile
+++ b/Makefile
@@ -72,8 +72,7 @@ BOARD_OBJS += \
 	$(TOPLEVEL)/stm-fpgacfg.o \
 	$(TOPLEVEL)/stm-keystore.o \
 	$(TOPLEVEL)/stm-sdram.o \
-	$(TOPLEVEL)/stm-flash.o \
-	$(TOPLEVEL)/stm-log.o
+	$(TOPLEVEL)/stm-flash.o
 endif
 export BOARD_OBJS
 
diff --git a/projects/bootloader/Makefile b/projects/bootloader/Makefile
index 7de93c0..8415c69 100644
--- a/projects/bootloader/Makefile
+++ b/projects/bootloader/Makefile
@@ -1,6 +1,6 @@
 PROG = bootloader
 
-OBJS = crc32.o dfu.o
+OBJS = crc32.o dfu.o log.o
 
 BOARD_OBJS = \
 	./stm-init.o \
diff --git a/stm-log.c b/projects/bootloader/log.c
similarity index 98%
copy from stm-log.c
copy to projects/bootloader/log.c
index a8a9fd9..ee951d9 100644
--- a/stm-log.c
+++ b/projects/bootloader/log.c
@@ -1,6 +1,6 @@
 /*
- * stm-log.c
- * ----------------
+ * log.c
+ * -----
  * Implement libhal logging API on Alpha.
  *
  * Copyright (c) 2017, NORDUnet A/S All rights reserved.
diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
index b92390a..56ee462 100644
--- a/projects/hsm/Makefile
+++ b/projects/hsm/Makefile
@@ -9,7 +9,8 @@ OBJS = crc32.o \
 	mgmt-keystore.c \
 	mgmt-masterkey.c \
 	mgmt-misc.c \
-	mgmt-thread.c
+	mgmt-thread.c \
+	log.o
 
 BOARD_OBJS = \
 	$(TOPLEVEL)/stm-init.o \
diff --git a/stm-log.c b/projects/hsm/log.c
similarity index 98%
rename from stm-log.c
rename to projects/hsm/log.c
index a8a9fd9..ee951d9 100644
--- a/stm-log.c
+++ b/projects/hsm/log.c
@@ -1,6 +1,6 @@
 /*
- * stm-log.c
- * ----------------
+ * log.c
+ * -----
  * Implement libhal logging API on Alpha.
  *
  * Copyright (c) 2017, NORDUnet A/S All rights reserved.