Streamline the Makefile a bit...