merging of makefiles 2/2

FossilOrigin-Name: 119b9b45f1f89a632e6ce5d877d848edd63a1e02fefd8e1254ed0c33acac5c23
This commit is contained in:
crc 2019-05-01 11:55:08 +00:00
parent c225e88ddd
commit b4e1f5b17e