Reduce to nonrecursive make, fix break due to typedef change in send-tx.