[gtkglext] Apply AM_CONDITIONAL(GLU). Remove redundant $(GL_LIBS).



commit 16891e85d8bf2ca6537af92215bea2268fff3555
Author: Ralf Corsepius <rcorsepius src gnome org>
Date:   Wed Dec 30 06:34:22 2009 +0100

    Apply AM_CONDITIONAL(GLU).
    Remove redundant $(GL_LIBS).

 examples/Makefile.am |   53 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 insertions(+), 5 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index bfe4805..44c908f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -28,33 +28,51 @@ LDADD = \
 
 AM_LDFLAGS = \
 	$(GTK_LIBS)		\
-	$(GLU_LIBS)		\
 	$(GDKGLEXT_WIN_LIBS)
 
+if GLU
 noinst_LTLIBRARIES = libdrawshapes.la
 libdrawshapes_la_SOURCES = drawshapes.c drawshapes.h
-libdrawshapes_la_LIBADD = $(MATH_LIB) $(GL_LIBS) $(GLU_LIBS)
+libdrawshapes_la_LIBADD = $(MATH_LIB) $(GLU_LIBS)
+endif
 
 noinst_PROGRAMS =
 
+if GLU
 noinst_PROGRAMS += low-level
 low_level_SOURCES = low-level.c
 low_level_LDFLAGS = $(GLU_LIBS)
+endif
 
+if GLU
 noinst_PROGRAMS += simple
 simple_SOURCES = simple.c
+simple_LDFLAGS = $(GLU_LIBS)
+endif
 
+if GLU
 noinst_PROGRAMS += simple-mixed
 simple_mixed_SOURCES = simple-mixed.c
+simple_mixed_LDFLAGS = $(GLU_LIBS)
+endif
 
+if GLU
 noinst_PROGRAMS += pixmap
 pixmap_SOURCES = pixmap.c
+pixmap_LDFLAGS = $(GLU_LIBS)
+endif
 
+if GLU
 noinst_PROGRAMS += pixmap-mixed
 pixmap_mixed_SOURCES = pixmap-mixed.c
+pixmap_mixed_LDFLAGS = $(GLU_LIBS)
+endif
 
+if GLU
 noinst_PROGRAMS += share-lists
 share_lists_SOURCES = share-lists.c
+share_lists_LDFLAGS = $(GLU_LIBS)
+endif
 
 noinst_PROGRAMS += color
 color_SOURCES = color.c
@@ -62,13 +80,17 @@ color_SOURCES = color.c
 noinst_PROGRAMS += font
 font_SOURCES = font.c
 
+if GLU
 noinst_PROGRAMS += button
 button_SOURCES = button.c
 button_LDADD = $(LDADD) libdrawshapes.la
+endif
 
+if GLU
 noinst_PROGRAMS += shapes
 shapes_SOURCES = trackball.h trackball.c shapes.c
 shapes_LDADD = $(LDADD) libdrawshapes.la
+endif
 
 noinst_PROGRAMS += logo
 logo_SOURCES = trackball.h trackball.c logo-model.h logo-model.c logo.c
@@ -77,20 +99,32 @@ logo_SOURCES += logo-g.h logo-t.h logo-k.h
 noinst_PROGRAMS += gears
 gears_SOURCES = gears.c
 
+if GLU
 noinst_PROGRAMS += multiarb
 multiarb_SOURCES = readtex.h readtex.c multiarb.c
+multiarb_LDFLAGS = $(GLU_LIBS)
+endif
 
+if GLU
 noinst_PROGRAMS += viewlw
 viewlw_SOURCES = viewlw.c lw.h lw.c trackball.h trackball.c
+viewlw_LDFLAGS = $(GLU_LIBS)
+endif
 
 noinst_PROGRAMS += rotating-square
 rotating_square_SOURCES = rotating-square.c
 
+if GLU
 noinst_PROGRAMS += coolwave
 coolwave_SOURCES = coolwave.c
+coolwave_LDFLAGS = $(GLU_LIBS)
+endif
 
+if GLU
 noinst_PROGRAMS += coolwave2
 coolwave2_SOURCES = coolwave2.c
+coolwave2_LDFLAGS = $(GLU_LIBS)
+endif
 
 noinst_PROGRAMS += template
 template_SOURCES = template.c
@@ -98,19 +132,26 @@ template_SOURCES = template.c
 noinst_PROGRAMS += scribble-gl
 scribble_gl_SOURCES = scribble-gl.c
 
+if GLU
 noinst_PROGRAMS += font-pangoft2
 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)
+font_pangoft2_LDFLAGS = $(AM_LDFLAGS) $(PANGOFT2_LIBS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2) $(GLU_LIBS)
+endif
 
+if GLU
 noinst_PROGRAMS += font-pangoft2-tex
 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)
+font_pangoft2_tex_LDFLAGS = $(AM_LDFLAGS) $(PANGOFT2_LIBS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2) $(GLU_LIBS)
+endif
 
 if !PLATFORM_WIN32
+if GLU
 noinst_PROGRAMS += simple-pbuffer-sgix
 simple_pbuffer_sgix_SOURCES = simple-pbuffer-sgix.c
+simple_pbuffer_sgix_LDFLAGS = $(GLU_LIBS)
+endif
 endif
 
 if PLATFORM_WIN32
@@ -120,9 +161,11 @@ wglinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS)
 endif
 
 if !PLATFORM_WIN32
+if GLU
 noinst_PROGRAMS += glxinfo
 glxinfo_SOURCES = glxinfo.c
-glxinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS) $(MATH_LIB)
+glxinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS) $(GLU_LIBS) $(MATH_LIB)
+endif
 endif
 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]