[gtkglext] Link examples that use libGLU with the C++ linker; libGLU is typically implemented in C++. Also, ap

[Braden McDaniel <bradenmcd src gnome org>]

commit 8e382894e0247464bd044005ef92fe4631c3cbf8
Author: Braden McDaniel <braden endoframe com>
Date:   Fri Oct 8 03:48:14 2010 -0400

    Link examples that use libGLU with the C++ linker; libGLU is typically implemented in C++.  Also, apply GL_LIBS some places it was missing.

 configure.ac         |    1 +
 examples/Makefile.am |   49 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 576694b..6c198e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,7 @@ AC_PROG_OBJC
 AM_DISABLE_STATIC
 LT_PREREQ([2.2.6])
 LT_INIT([win32-dll])
+LT_LANG([C++])
 
 AC_CHECK_PROG([ms_librarian], [lib.exe], [yes], [no])
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index d9f4a96..40378fd 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -29,46 +29,54 @@ AM_LDFLAGS = \
 
 if GLU
 noinst_LTLIBRARIES = libdrawshapes.la
+nodist_EXTRA_libdrawshapes_la_SOURCES = ltdummy.cpp
 libdrawshapes_la_SOURCES = drawshapes.c drawshapes.h
-libdrawshapes_la_LIBADD = $(MATH_LIB) $(GLU_LIBS)
+libdrawshapes_la_LIBADD = $(MATH_LIB) $(GLU_LIBS) $(GL_LIBS)
 endif
 
 noinst_PROGRAMS =
 
 if GLU
 noinst_PROGRAMS += low-level
+nodist_EXTRA_low_level_SOURCES = dummy.cpp
 low_level_SOURCES = low-level.c
-low_level_LDFLAGS = $(GLU_LIBS)
+low_level_LDFLAGS = $(AM_LDFLAGS) $(GLU_LIBS) $(GL_LIBS)
+low_level_LDADD = ../gdk/$(gdkglext_targetlib)
 endif
 
 if GLU
 noinst_PROGRAMS += simple
+nodist_EXTRA_simple_SOURCES = dummy.cpp
 simple_SOURCES = simple.c
-simple_LDFLAGS = $(GLU_LIBS)
+simple_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 if GLU
 noinst_PROGRAMS += simple-mixed
+nodist_EXTRA_simple_mixed_SOURCES = dummy.cpp
 simple_mixed_SOURCES = simple-mixed.c
-simple_mixed_LDFLAGS = $(GLU_LIBS)
+simple_mixed_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 if GLU
 noinst_PROGRAMS += pixmap
+nodist_EXTRA_pixmap_SOURCES = dummy.cpp
 pixmap_SOURCES = pixmap.c
-pixmap_LDFLAGS = $(GLU_LIBS)
+pixmap_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 if GLU
 noinst_PROGRAMS += pixmap-mixed
+nodist_EXTRA_pixmap_mixed_SOURCES = dummy.cpp
 pixmap_mixed_SOURCES = pixmap-mixed.c
-pixmap_mixed_LDFLAGS = $(GLU_LIBS)
+pixmap_mixed_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 if GLU
 noinst_PROGRAMS += share-lists
+nodist_EXTRA_share_lists_SOURCES = dummy.cpp
 share_lists_SOURCES = share-lists.c
-share_lists_LDFLAGS = $(GLU_LIBS)
+share_lists_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 noinst_PROGRAMS += color
@@ -76,12 +84,14 @@ color_SOURCES = color.c
 
 if GLU
 noinst_PROGRAMS += button
+nodist_EXTRA_button_SOURCES = dummy.cpp
 button_SOURCES = button.c
 button_LDADD = $(LDADD) libdrawshapes.la
 endif
 
 if GLU
 noinst_PROGRAMS += shapes
+nodist_EXTRA_shapes_SOURCES = dummy.cpp
 shapes_SOURCES = trackball.h trackball.c shapes.c
 shapes_LDADD = $(LDADD) libdrawshapes.la
 endif
@@ -95,14 +105,16 @@ gears_SOURCES = gears.c
 
 if GLU
 noinst_PROGRAMS += multiarb
+nodist_EXTRA_multiarb_SOURCES = dummy.cpp
 multiarb_SOURCES = readtex.h readtex.c multiarb.c
-multiarb_LDFLAGS = $(GLU_LIBS)
+multiarb_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 if GLU
 noinst_PROGRAMS += viewlw
+nodist_EXTRA_viewlw_SOURCES = dummy.cpp
 viewlw_SOURCES = viewlw.c lw.h lw.c trackball.h trackball.c
-viewlw_LDFLAGS = $(GLU_LIBS)
+viewlw_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 noinst_PROGRAMS += rotating-square
@@ -110,14 +122,16 @@ rotating_square_SOURCES = rotating-square.c
 
 if GLU
 noinst_PROGRAMS += coolwave
+nodist_EXTRA_coolwave_SOURCES = dummy.cpp
 coolwave_SOURCES = coolwave.c
-coolwave_LDFLAGS = $(GLU_LIBS)
+coolwave_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 if GLU
 noinst_PROGRAMS += coolwave2
+nodist_EXTRA_coolwave2_SOURCES = dummy.cpp
 coolwave2_SOURCES = coolwave2.c
-coolwave2_LDFLAGS = $(GLU_LIBS)
+coolwave2_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 
 noinst_PROGRAMS += template
@@ -128,24 +142,27 @@ scribble_gl_SOURCES = scribble-gl.c
 
 if GLU
 noinst_PROGRAMS += font-pangoft2
+nodist_EXTRA_font_pangoft2_SOURCES = dummy.cpp
 font_pangoft2_SOURCES = font-pangoft2.c
 font_pangoft2_CPPFLAGS = $(AM_CPPFLAGS) $(PANGOFT2_CFLAGS)
-font_pangoft2_LDFLAGS = $(AM_LDFLAGS) $(PANGOFT2_LIBS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2) $(GLU_LIBS)
+font_pangoft2_LDFLAGS = $(AM_LDFLAGS) $(PANGOFT2_LIBS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2) $(GLU_LIBS) $(GL_LIBS)
 endif
 
 if GLU
 noinst_PROGRAMS += font-pangoft2-tex
+nodist_EXTRA_font_pangoft2_tex_SOURCES = dummy.cpp
 font_pangoft2_tex_SOURCES = font-pangoft2-tex.c
 font_pangoft2_tex_CPPFLAGS = $(AM_CPPFLAGS) $(PANGOFT2_CFLAGS)
-font_pangoft2_tex_LDFLAGS = $(AM_LDFLAGS) $(PANGOFT2_LIBS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2) $(GLU_LIBS)
+font_pangoft2_tex_LDFLAGS = $(AM_LDFLAGS) $(PANGOFT2_LIBS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2) $(GLU_LIBS) $(GL_LIBS)
 endif
 
 if !PLATFORM_WIN32
 if !TARGET_QUARTZ
 if GLU
 noinst_PROGRAMS += simple-pbuffer-sgix
+nodist_EXTRA_simple_pbuffer_sgix_SOURCES = dummy.cpp
 simple_pbuffer_sgix_SOURCES = simple-pbuffer-sgix.c
-simple_pbuffer_sgix_LDFLAGS = $(GLU_LIBS)
+simple_pbuffer_sgix_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
 endif
 endif
 endif
@@ -160,8 +177,9 @@ if !PLATFORM_WIN32
 if !TARGET_QUARTZ
 if GLU
 noinst_PROGRAMS += glxinfo
+nodist_EXTRA_glxinfo_SOURCES = dummy.cpp
 glxinfo_SOURCES = glxinfo.c
-glxinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS) $(GLU_LIBS) $(MATH_LIB)
+glxinfo_LDADD = $(WINDOWING_LIBS) $(GLU_LIBS) $(GL_LIBS) $(MATH_LIB)
 endif
 endif
 endif
@@ -179,4 +197,3 @@ glsl/shiny.fsh \
 glsl/shiny.vsh \
 glsl/velvet.fsh \
 glsl/velvet.vsh
-