Cant remove mesa standalone

Hello:

I made a mistake trying to install the newest version of Mesa (7.8.2). I
explain what had happened:

1) I had had Mesa 7.6.1  installed in my notebook, with a videocard
Intel 945GM. 
2)I wanted upgrade it, so download the 7.8.2 tar.gz pkg and installed by
mistake the standalone version.
3)Next my notebook turn out very slow.
4)So I try to install the Mesa DRI 7.8.2, but I cant do it because the
next error at compiling:
http://pastebin.com/pj0SqbkP
5)I cant uninstall Mesa standalone! I didn't remove the sources, but
Idont know why a sudo make uninstall desnt work for me.
6)next, i try to reinstall Mesa packages from apt-get, but OpenGL
persists in the version installed with sources :( 


My information is:

packages 7.8.2 driving my videocard

esteban@esteban-laptop:~$ glxinfo | grep Mesa
server glx version string: 1.4 Mesa 7.8.2
client glx version string: 1.4 Mesa 7.8.2
OpenGL renderer string: Mesa X11
OpenGL version string: 2.1 Mesa 7.8.2

esteban@esteban-laptop:~$ glxinfo | grep -i render
direct rendering: Yes
OpenGL renderer string: Mesa X11
    GL_NV_conditional_render, GL_NV_depth_clamp,
GL_NV_fragment_program, 


packages 7.6.1 in dpkg:

esteban@esteban-laptop:~$ dpkg -l | grep mesa
ii  libgl1-mesa-dev
7.6.1~git20091217.20ee2759-0ubuntu0~xup~1  A free implementation of the
OpenGL API -- GLX developm
ii  libgl1-mesa-dri
7.6.1~git20091217.20ee2759-0ubuntu0~xup~1  A free implementation of the
OpenGL API -- DRI modules
ii  libgl1-mesa-glx
7.6.1~git20091217.20ee2759-0ubuntu0~xup~1  A free implementation of the
OpenGL API -- GLX runtime
ii  libglu1-mesa
7.6.1~git20091217.20ee2759-0ubuntu0~xup~1  The OpenGL utility library
(GLU)
ii  libglu1-mesa-dev
7.6.1~git20091217.20ee2759-0ubuntu0~xup~1  The OpenGL utility library --
development files
ii  mesa-common-dev
7.6.1~git20091217.20ee2759-0ubuntu0~xup~1  Developer documentation for
Mesa
ii  mesa-utils
7.6.1~git20091217.20ee2759-0ubuntu0~xup~1  Miscellaneous Mesa GL
utilities
ii  xlibmesa-gl-dev                                  1:7.4+3ubuntu10
transitional package for Debian etch

My videocard is

esteban@esteban-laptop:~$ lspci | grep VGA
00:02.0 VGA compatible controller: Intel Corporation Mobile 945GM/GMS,
943/940GML Express Integrated Graphics Controller (rev 03)

And I am using Ubuntu 10.04


Regards

Esteban