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

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

File diff suppressed because one or more lines are too long

View File

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