Updated Makefile options to include subdir-objects