Reorganized Makefile so object files are not specified in multiple places