Improve makefiles

Reported by:	matthew