r1760: improved makefiles