From 4ff9f11a00e866d65d180a3dd4f1cba43ba45327 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Fri, 16 Nov 2012 13:02:21 -0600
Subject: [PATCH] GLUT: Break GLUT out from libGL

 * It was confirmed that GLUT was *not* in libGL
---
 build/jam/HaikuImage                 |  9 ++++-----
 src/kits/opengl/Jamfile              |  3 ---
 src/libs/glut/Jamfile                |  6 +++---
 src/tests/kits/opengl/glinfo/Jamfile | 13 ++++++++-----
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index b4b6fd85a0..58ce1557c5 100644
--- a/build/jam/HaikuImage
+++ b/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 ;
diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile
index 009ff9fe10..2b96f1f0e2 100644
--- a/src/kits/opengl/Jamfile
+++ b/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)
 
diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile
index cb380e8fb1..d5547c2858 100644
--- a/src/libs/glut/Jamfile
+++ b/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++)
 ;
diff --git a/src/tests/kits/opengl/glinfo/Jamfile b/src/tests/kits/opengl/glinfo/Jamfile
index e02567ed5e..d1b503d120 100644
--- a/src/tests/kits/opengl/glinfo/Jamfile
+++ b/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 :