These new patches fix build with make >= 4.0 and gcc 5. Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov@gmail.com>