* updated and integrated makefiles
* added some auto dependencies