Streamline the makefile targets