j3d1/bearssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Rules.mk more compatible with merges and local diffs.

Browse source
This commit is contained in:
Thomas Pornin 2017-11-02 13:52:49 +01:00
parent dddc412922
commit 4cbe51b0d0
2 changed files with 265 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

265
mk/Rules.mk
View file

File diff suppressed because one or more lines are too long

10
mk/mkrules.sh
View file

@ -392,23 +392,23 @@ EOF
(printf "\nOBJ =" (printf "\nOBJ ="
for f in $coresrc ; do for f in $coresrc ; do
printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O" printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
done done
printf "\nOBJBRSSL =" printf "\nOBJBRSSL ="
for f in $toolssrc ; do for f in $toolssrc ; do
printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O" printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
done done
printf "\nOBJTESTCRYPTO =" printf "\nOBJTESTCRYPTO ="
for f in $testcryptosrc ; do for f in $testcryptosrc ; do
printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O" printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
done done
printf "\nOBJTESTSPEED =" printf "\nOBJTESTSPEED ="
for f in $testspeedsrc ; do for f in $testspeedsrc ; do
printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O" printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
done done
printf "\nOBJTESTX509 =" printf "\nOBJTESTX509 ="
for f in $testx509src ; do for f in $testx509src ; do
printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O" printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
done done
printf "\nHEADERSPUB =" printf "\nHEADERSPUB ="
for f in $headerspub ; do for f in $headerspub ; do