Improved Makefile (better use of implicit rules)