Makefile: polish up and re-arrange
Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>