Revert "Simplify make commands"

This reverts commit f8eedadad0a611aba6ae5951e41dc2bfd0ef5bf0.