Merge Makefile rewrite into master
authorDavid Gibson <david@gibson.dropbear.id.au>
Mon, 21 Nov 2016 12:24:36 +0000 (23:24 +1100)
committerDavid Gibson <david@gibson.dropbear.id.au>
Mon, 21 Nov 2016 12:24:36 +0000 (23:24 +1100)
commit61f58ff94e35c9b8ac5488554e2554bc5c9888b3
tree7b790410c2c957cad366115b63f4ed1ac17bccf0
parent68c74ffd4356e26ba25b4fbbf9a8f832dcb8a0b8
parent9dbf8b3fd6fd65a59ccbb49fb9b7f0cc5cdf18d8
Merge Makefile rewrite into master

# Conflicts:
# .travis.yml
# Makefile
# Makefile-ccan
.travis.yml
Makefile