Follow make code conventions

Summary:
Organize Makefile to be ready to accept new features,
the next one being for T1691.

Test Plan: make clean all

Reviewers: dereckson

Reviewed By: dereckson

Differential Revision: https://devcentral.nasqueron.org/D2556