more makefile stuff

...more cleanup around configure.ac and makefile...