Reduce makefile cleverness for readability's sake

Signed-off-by: Michael McCracken <mike.mccracken@canonical.com>