summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2018-12-25 10:33:35 -0500
committerSolomon Peachy <pizza@shaftnet.org>2018-12-25 11:54:11 -0500
commit4c933a1d018cdd4d9528441652794971a8a806bc (patch)
tree96c779158dd73e95876b5306df3c72c2eed66c9c
parent9b3f22ac3af7f89f8b70aa2580435fbb9a5cf052 (diff)
downloadrockbox-4c933a1d018cdd4d9528441652794971a8a806bc.tar.gz
rockbox-4c933a1d018cdd4d9528441652794971a8a806bc.tar.bz2
rockbox-4c933a1d018cdd4d9528441652794971a8a806bc.zip
build: Properly generate build dependency for autogenerated bitmap .h files
* bmp2rb generated a .h file that rockbox .c files used. * .h files in .c files were used to generate dependency graphs for make * When Make saw the .h file for the bitmap, it didn't know how what to do with them * Only arose in parallel builds Fixed this by adding explicit dependencies for the .h files as part of the existing 'bmpdepfile' function. Solves the Xduoo X3 bootloader build failure that I could trigger 100% of the time by using 'make -j8' Change-Id: I6b3e78dde26c820a3b6c7c286e7d6c981b8e01fc
-rw-r--r--tools/functions.make2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/functions.make b/tools/functions.make
index 806e1a2f3e..a2c715e9e1 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -55,8 +55,10 @@ bmpdepfile = $(SILENT) \
for each in $(2); do \
obj=`echo $$each | sed -e 's/\.bmp/.o/' -e 's:$(ROOTDIR):$(BUILDDIR):'`; \
src=`echo $$each | sed -e 's/\.bmp/.c/' -e 's:$(ROOTDIR):$(BUILDDIR):'`; \
+ hdr=`echo $$each | sed -e 's/.*\/\(.*\)\..*\.bmp/bitmaps\/\1\.h/'`; \
echo $$obj: $$src; \
echo $$src: $$each; \
+ echo $(BUILDDIR)/$$hdr: $$src; \
done \
>> $(1)