Description: fix the makefiles to make sure GL visualizations get built against
             libGL (LP: #115502)
Author: David Leverton
Last-Update: 2007-10-11
Index: libvisual-plugins/plugins/actor/bumpscope/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/bumpscope/Makefile.am
+++ libvisual-plugins/plugins/actor/bumpscope/Makefile.am
@@ -2,13 +2,12 @@
 
 actor_plugin_LTLIBRARIES = actor_bumpscope.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 actor_bumpscope_la_LDFLAGS = -module -avoid-version 
+actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS)
 
 actor_bumpscope_la_SOURCES = actor_bumpscope.c \
 			  actor_bumpscope.h \
Index: libvisual-plugins/plugins/actor/corona/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/corona/Makefile.am
+++ libvisual-plugins/plugins/actor/corona/Makefile.am
@@ -2,13 +2,12 @@
 
 actor_plugin_LTLIBRARIES = actor_corona.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir)
 
 actor_corona_la_LDFLAGS = -module -avoid-version
+actor_corona_la_LIBADD = $(LIBVISUAL_LIBS)
 
 actor_corona_la_SOURCES = actor_corona.cpp \
 			  autopal.h \
Index: libvisual-plugins/plugins/actor/gdkpixbuf/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/gdkpixbuf/Makefile.am
+++ libvisual-plugins/plugins/actor/gdkpixbuf/Makefile.am
@@ -2,13 +2,12 @@
 
 actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la
 
-LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version 
+actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS)
 
 actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c
 
Index: libvisual-plugins/plugins/actor/gstreamer/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/gstreamer/Makefile.am
+++ libvisual-plugins/plugins/actor/gstreamer/Makefile.am
@@ -2,14 +2,13 @@
 
 actor_plugin_LTLIBRARIES = actor_gstreamer.la
 
-LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS)
 
 INCLUDES = $(all_includes) \
 	-I$(top_srcdir) 
 
 actor_gstreamer_la_LDFLAGS = -module -avoid-version 
+actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
 
 actor_gstreamer_la_SOURCES = actor_gstreamer.c
 
Index: libvisual-plugins/plugins/actor/infinite/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/infinite/Makefile.am
+++ libvisual-plugins/plugins/actor/infinite/Makefile.am
@@ -2,13 +2,12 @@
 
 actor_plugin_LTLIBRARIES = actor_infinite.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 actor_infinite_la_LDFLAGS = -module -avoid-version 
+actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS)
 
 actor_infinite_la_SOURCES = compute.c compute.h \
 			    display.c display.h \
Index: libvisual-plugins/plugins/actor/jakdaw/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/jakdaw/Makefile.am
+++ libvisual-plugins/plugins/actor/jakdaw/Makefile.am
@@ -2,13 +2,12 @@
 
 actor_plugin_LTLIBRARIES = actor_jakdaw.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 actor_jakdaw_la_LDFLAGS = -module -avoid-version 
+actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS)
 
 actor_jakdaw_la_SOURCES = actor_jakdaw.c \
 			  actor_jakdaw.h \
Index: libvisual-plugins/plugins/actor/JESS/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/JESS/Makefile.am
+++ libvisual-plugins/plugins/actor/JESS/Makefile.am
@@ -2,13 +2,12 @@
 
 actor_plugin_LTLIBRARIES = actor_JESS.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 actor_JESS_la_LDFLAGS = -module -avoid-version
+actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS)
 
 actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\
 			distorsion.c distorsion.h\
Index: libvisual-plugins/plugins/actor/lv_analyzer/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/lv_analyzer/Makefile.am
+++ libvisual-plugins/plugins/actor/lv_analyzer/Makefile.am
@@ -2,14 +2,13 @@
 
 actor_plugin_LTLIBRARIES = actor_lv_analyzer.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) \
 	-I$(top_srcdir) 
 
 actor_lv_analyzer_la_LDFLAGS = -module -avoid-version 
+actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS)
 
 actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c
 
Index: libvisual-plugins/plugins/actor/lv_gltest/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/lv_gltest/Makefile.am
+++ libvisual-plugins/plugins/actor/lv_gltest/Makefile.am
@@ -4,5 +4,5 @@ actor_plugin_LTLIBRARIES = actor_lv_glte
 
 actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
 actor_lv_gltest_la_LDFLAGS = -module -avoid-version 
-actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
+actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
 actor_lv_gltest_la_SOURCES = actor_lv_gltest.c
Index: libvisual-plugins/plugins/actor/lv_scope/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/lv_scope/Makefile.am
+++ libvisual-plugins/plugins/actor/lv_scope/Makefile.am
@@ -2,13 +2,12 @@
 
 actor_plugin_LTLIBRARIES = actor_lv_scope.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 actor_lv_scope_la_LDFLAGS = -module -avoid-version 
+actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS)
 
 actor_lv_scope_la_SOURCES = actor_lv_scope.c
 
Index: libvisual-plugins/plugins/actor/madspin/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/madspin/Makefile.am
+++ libvisual-plugins/plugins/actor/madspin/Makefile.am
@@ -10,5 +10,5 @@ actor_plugin_LTLIBRARIES = actor_madspin
 
 actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\"
 actor_madspin_la_LDFLAGS = -module -avoid-version 
-actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
+actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
 actor_madspin_la_SOURCES = madspin.c
Index: libvisual-plugins/plugins/actor/nastyfft/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/nastyfft/Makefile.am
+++ libvisual-plugins/plugins/actor/nastyfft/Makefile.am
@@ -4,5 +4,5 @@ actor_plugin_LTLIBRARIES = actor_nastyff
 
 actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
 actor_nastyfft_la_LDFLAGS = -module -avoid-version 
-actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
+actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
 actor_nastyfft_la_SOURCES = actor_nastyfft.c
Index: libvisual-plugins/plugins/actor/oinksie/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/oinksie/Makefile.am
+++ libvisual-plugins/plugins/actor/oinksie/Makefile.am
@@ -2,13 +2,12 @@
 
 actor_plugin_LTLIBRARIES = actor_oinksie.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 actor_oinksie_la_LDFLAGS = -module -avoid-version 
+actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS)
 
 actor_oinksie_la_SOURCES = actor_oinksie.c\
 			   oinksie.c oinksie.h\
Index: libvisual-plugins/plugins/actor/pseudotoad_flower/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/actor/pseudotoad_flower/Makefile.am
+++ libvisual-plugins/plugins/actor/pseudotoad_flower/Makefile.am
@@ -4,7 +4,7 @@ actor_plugin_LTLIBRARIES = actor_flower.
 
 actor_flower_la_LDFLAGS = -module -avoid-version 
 actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
-actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
+actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
 
 actor_flower_la_SOURCES = \
 	actor_flower.c \
Index: libvisual-plugins/plugins/input/alsa/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/input/alsa/Makefile.am
+++ libvisual-plugins/plugins/input/alsa/Makefile.am
@@ -2,12 +2,11 @@
 
 input_plugin_LTLIBRARIES = input_alsa.la
 
-LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
 
 input_alsa_la_LDFLAGS = -module -avoid-version 
+input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS)
 
 input_alsa_la_SOURCES = input_alsa.c
Index: libvisual-plugins/plugins/input/debug/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/input/debug/Makefile.am
+++ libvisual-plugins/plugins/input/debug/Makefile.am
@@ -2,11 +2,10 @@
 
 input_plugin_LTLIBRARIES = input_debug.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
 
 input_debug_la_LDFLAGS = -module -avoid-version 
+input_debug_la_LIBADD = $(LIBVISUAL_LIBS)
 input_debug_la_SOURCES = input_debug.c
Index: libvisual-plugins/plugins/input/esd/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/input/esd/Makefile.am
+++ libvisual-plugins/plugins/input/esd/Makefile.am
@@ -2,11 +2,10 @@
 
 input_plugin_LTLIBRARIES = input_esd.la
 
-LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir)
 
 input_esd_la_LDFLAGS = -module -avoid-version 
+input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
 input_esd_la_SOURCES = input_esd.c
Index: libvisual-plugins/plugins/input/jack/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/input/jack/Makefile.am
+++ libvisual-plugins/plugins/input/jack/Makefile.am
@@ -2,13 +2,12 @@
 
 input_plugin_LTLIBRARIES = input_jack.la
 
-LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 input_jack_la_LDFLAGS = -module -avoid-version 
+input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
 
 input_jack_la_SOURCES = input_jack.c
 
Index: libvisual-plugins/plugins/input/mplayer/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/input/mplayer/Makefile.am
+++ libvisual-plugins/plugins/input/mplayer/Makefile.am
@@ -2,12 +2,11 @@
 
 input_plugin_LTLIBRARIES = input_mplayer.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 input_mplayer_la_LDFLAGS = -module -avoid-version 
+input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS)
 input_mplayer_la_SOURCES = input_mplayer.c
 
Index: libvisual-plugins/plugins/morph/alphablend/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/morph/alphablend/Makefile.am
+++ libvisual-plugins/plugins/morph/alphablend/Makefile.am
@@ -2,11 +2,10 @@
 
 morph_plugin_LTLIBRARIES = morph_alphablend.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 morph_alphablend_la_LDFLAGS = -module -avoid-version 
+morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS)
 morph_alphablend_la_SOURCES = morph_alphablend.c
Index: libvisual-plugins/plugins/morph/flash/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/morph/flash/Makefile.am
+++ libvisual-plugins/plugins/morph/flash/Makefile.am
@@ -2,11 +2,10 @@
 
 morph_plugin_LTLIBRARIES = morph_flash.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 morph_flash_la_LDFLAGS = -module -avoid-version 
+morph_flash_la_LIBADD = $(LIBVISUAL_LIBS)
 morph_flash_la_SOURCES = morph_flash.c
Index: libvisual-plugins/plugins/morph/slide/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/morph/slide/Makefile.am
+++ libvisual-plugins/plugins/morph/slide/Makefile.am
@@ -2,11 +2,10 @@
 
 morph_plugin_LTLIBRARIES = morph_slide.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 morph_slide_la_LDFLAGS = -module -avoid-version 
+morph_slide_la_LIBADD = $(LIBVISUAL_LIBS)
 morph_slide_la_SOURCES = morph_slide.c
Index: libvisual-plugins/plugins/morph/tentacle/Makefile.am
===================================================================
--- libvisual-plugins.orig/plugins/morph/tentacle/Makefile.am
+++ libvisual-plugins/plugins/morph/tentacle/Makefile.am
@@ -2,11 +2,10 @@
 
 morph_plugin_LTLIBRARIES = morph_tentacle.la
 
-LIBS += $(LIBVISUAL_LIBS)
-
 AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir) 
 
 morph_tentacle_la_LDFLAGS = -module -avoid-version 
+morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS)
 morph_tentacle_la_SOURCES = morph_tentacle.c