aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-06-23 16:38:11 -0400
committerRob Austein <sra@hactrn.net>2016-06-23 16:38:11 -0400
commit5a310ac47beb5590a21a409168d8b271ff1bc11c (patch)
tree54291164f8329bfdd35e8a5f429946622e0e293a
parent8129748a055a8f3c1224fdb12c6c6bfbf558f5f3 (diff)
Tweak dependencies so we don't rebuild (particularly the bitstream) unnecessarily.
-rw-r--r--Makefile22
m---------sw/stm320
2 files changed, 12 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index c6654e0..fc98e1d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,23 +4,25 @@
export GNUPGHOME := /home/aptbot/gnupg
-TARBALL := package.tar.gz
-
-FIRMWARE := sw/stm32/projects/bootloader/bootloader.bin \
- sw/stm32/projects/bootloader/bootloader.elf \
- sw/stm32/projects/hsm/hsm.bin \
- sw/stm32/projects/hsm/hsm.elf \
- core/platform/alpha/build/alpha_fmc.bit
+TARBALL := package.tar.gz
+BITSTREAM := core/platform/alpha/build/alpha_fmc.bit
+BINARIES := sw/stm32/projects/bootloader/bootloader.bin sw/stm32/projects/hsm/hsm.bin
+FIRMWARE := ${BITSTREAM} ${BINARIES} ${BINARIES:.bin=.elf}
+RTLSOURCE := $(shell find core -name .git -prune -o -path core/platform/alpha/build -prune -o -type f -print)
all: bitstream elves package
-bitstream:
+bitstream: ${BITSTREAM}
+
+${BITSTREAM}: ${RTLSOURCE}
cd core/platform/alpha/build; ${MAKE}
+${BINARIES}: elves
+
elves:
cd sw/stm32; ${MAKE} bootloader hsm
-package: bitstream elves ${TARBALL}
+package: ${TARBALL}
${TARBALL}: ${FIRMWARE}
./build-package.py $(basename $@) $^
@@ -30,4 +32,4 @@ clean:
git clean -dfx
git submodule foreach git clean -dfx
-.PHONY: bitstream elves package clean
+.PHONY: all bitstream elves package clean
diff --git a/sw/stm32 b/sw/stm32
-Subproject 85582f7a86de10c0e5ad234d6b6f40135549f3d
+Subproject 164c253976d24a39a5a19b5831a693ece53445f