Make the makefiles more selective in deleting eps files
More makefile fixes
More Makefile fixes