Added object groups to makefile
tweaks for autotools