Merge branch 'ehofman/rename'

diff --cc tests/Makefile.am
index 103660b06147a4925345c5137624db541ffd710d,c3e2dc57070d070b4f3a21cad51e6906d5227f69..2062c36ba29a7021bd902d2e9c2577644d3ee310
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -8,14 -8,14 +8,14 @@@ els
  test_up_PLIB_LIBS = -lplibsg -lplibul
  endif
  
- est_epsilon_SOURCES = est-epsilon.c
+ est_epsilon_SOURCES = est-epsilon.cxx
  est_epsilon_LDADD =  $(opengl_LIBS)
  
- gl_info_SOURCES = gl-info.c
+ gl_info_SOURCES = gl-info.cxx
  gl_info_LDADD = $(opengl_LIBS)
  
 -al_info_SOURCES = al-info.c
 -al_info_LDADD = $(openal_LIBS)
 +alcinfo_SOURCES = alcinfo.cxx
 +alcinfo_LDADD = $(openal_LIBS)
  
  test_env_map_SOURCES = test-env-map.cxx
  test_env_map_LDADD = $(opengl_LIBS)