Simplified the makefile again.