removed macros from spec
greatly refactored Makefile.am