Generalized Makefile.

Hi!

I have generalized the Makefile a bit. Please pull!

Olaf