GLUT: Break GLUT out from libGL

* It was confirmed that GLUT was *not* in libGL

build/jam/HaikuImage

@@ -86,8 +86,8 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(X86_ONLY)GLTeapot
 SYSTEM_LIBS =
 	libbe.so libbsd.so libbnetapi.so
 	libdebug.so libdevice.so
-	libgame.so $(X86_ONLY)libGL.so libgnu.so
-	libmail.so libmedia.so libmidi.so libmidi2.so
+	libgame.so $(X86_ONLY)libGL.so $(X86_ONLY)libglut.so
+	libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
 	libnetwork.so
 	<revisioned>libroot.so libroot-addon-icu.so
 	libscreensaver.so
@@ -305,9 +305,8 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
 }
 
 
-# libGL.so has GLU (like BeOS) *and* GLUT API built-in
-SYSTEM_LIBS_LIBGL_ALIASES
-	= libGLU.so libglut.so ;
+# libGL.so has GLU (like BeOS) built-in
+SYSTEM_LIBS_LIBGL_ALIASES = libGLU.so ;
 
 if $(TARGET_ARCH) = x86 {
 	local lib ;

src/kits/opengl/Jamfile

@@ -46,9 +46,6 @@ SharedLibrary libGL.so : $(sources) :
 	# GLU
 	$(HAIKU_GLU_LIBS)
 
-	# Glut
-	<opengl>glut.o
-
 	# Mesa libraries (from Mesa optional package):
 	$(HAIKU_MESA_LIBS)
 

src/libs/glut/Jamfile

@@ -62,9 +62,9 @@ Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
 Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
 	: $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
 
-MergeObject <opengl>glut.o :
-	# C++ sources
+SharedLibrary libglut.so :
 	$(sourcesCpp)
-	# C sources
 	$(sourcesCc)
+	:
+	GL game be $(TARGET_LIBSTDC++)
 ;

src/tests/kits/opengl/glinfo/Jamfile

@@ -24,11 +24,14 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
 	# Dependency needed to trigger downloading/unzipping the package before
 	# compiling the files.
 
-Preference GLInfo
-	: $(sources)
-	: be GL translation libcolumnlistview.a $(HAIKU_LOCALE_LIBS)
-		$(TARGET_LIBSUPC++)
-	: GLInfo.rdef
+Preference GLInfo :
+	$(sources)
+	:
+	be GL libglut.so 
+	translation libcolumnlistview.a $(HAIKU_LOCALE_LIBS)
+	$(TARGET_LIBSUPC++)
+	:
+	GLInfo.rdef
 ;
 
 DoCatalogs GLInfo :