Revert "change makefiles"

This reverts commit a932628c24db26ea991a246a42711912d73cb1ca.