libvisual-plugins/repos/extra-x86_64/03_build_against_gl_fixes.patch

   1 diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am
   2 --- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am 2006-02-23 20:03:24.000000000 +1100
   3 +++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am     2007-07-04 18:19:43.000000000 +1000
   4 @@ -2,13 +2,12 @@
   5
   6  actor_plugin_LTLIBRARIES = actor_bumpscope.la
   7
   8 -LIBS += $(LIBVISUAL_LIBS)
   9 -
  10  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
  11
  12  INCLUDES = $(all_includes) -I$(top_srcdir)
  13
  14  actor_bumpscope_la_LDFLAGS = -module -avoid-version
  15 +actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS)
  16
  17  actor_bumpscope_la_SOURCES = actor_bumpscope.c \
  18                           actor_bumpscope.h \
  19 diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am
  20 --- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am    2006-02-23 20:03:24.000000000 +1100
  21 +++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am        2007-07-04 18:19:43.000000000 +1000
  22 @@ -2,13 +2,12 @@
  23
  24  actor_plugin_LTLIBRARIES = actor_corona.la
  25
  26 -LIBS += $(LIBVISUAL_LIBS)
  27 -
  28  AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
  29
  30  INCLUDES = $(all_includes) -I$(top_srcdir)
  31
  32  actor_corona_la_LDFLAGS = -module -avoid-version
  33 +actor_corona_la_LIBADD = $(LIBVISUAL_LIBS)
  34
  35  actor_corona_la_SOURCES = actor_corona.cpp \
  36                           autopal.h \
  37 diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am
  38 --- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am 2006-02-24 00:34:48.000000000 +1100
  39 +++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am     2007-07-04 18:19:43.000000000 +1000
  40 @@ -2,13 +2,12 @@
  41
  42  actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la
  43
  44 -LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS)
  45 -
  46  AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS)
  47
  48  INCLUDES = $(all_includes) -I$(top_srcdir)
  49
  50  actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version
  51 +actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS)
  52
  53  actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c
  54
  55 diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am
  56 --- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am 2006-02-23 20:03:27.000000000 +1100
  57 +++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am     2007-07-04 18:19:43.000000000 +1000
  58 @@ -2,14 +2,13 @@
  59
  60  actor_plugin_LTLIBRARIES = actor_gstreamer.la
  61
  62 -LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
  63 -
  64  AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS)
  65
  66  INCLUDES = $(all_includes) \
  67         -I$(top_srcdir)
  68
  69  actor_gstreamer_la_LDFLAGS = -module -avoid-version
  70 +actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
  71
  72  actor_gstreamer_la_SOURCES = actor_gstreamer.c
  73
  74 diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am
  75 --- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am  2006-02-23 20:03:27.000000000 +1100
  76 +++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am      2007-07-04 18:19:43.000000000 +1000
  77 @@ -2,13 +2,12 @@
  78
  79  actor_plugin_LTLIBRARIES = actor_infinite.la
  80
  81 -LIBS += $(LIBVISUAL_LIBS)
  82 -
  83  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
  84
  85  INCLUDES = $(all_includes) -I$(top_srcdir)
  86
  87  actor_infinite_la_LDFLAGS = -module -avoid-version
  88 +actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS)
  89
  90  actor_infinite_la_SOURCES = compute.c compute.h \
  91                             display.c display.h \
  92 diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am
  93 --- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am    2006-02-23 20:03:28.000000000 +1100
  94 +++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am        2007-07-04 18:19:43.000000000 +1000
  95 @@ -2,13 +2,12 @@
  96
  97  actor_plugin_LTLIBRARIES = actor_jakdaw.la
  98
  99 -LIBS += $(LIBVISUAL_LIBS)
 100 -
 101  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 102
 103  INCLUDES = $(all_includes) -I$(top_srcdir)
 104
 105  actor_jakdaw_la_LDFLAGS = -module -avoid-version
 106 +actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS)
 107
 108  actor_jakdaw_la_SOURCES = actor_jakdaw.c \
 109                           actor_jakdaw.h \
 110 diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am
 111 --- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am      2006-02-23 20:03:24.000000000 +1100
 112 +++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am  2007-07-04 18:19:43.000000000 +1000
 113 @@ -2,13 +2,12 @@
 114
 115  actor_plugin_LTLIBRARIES = actor_JESS.la
 116
 117 -LIBS += $(LIBVISUAL_LIBS)
 118 -
 119  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 120
 121  INCLUDES = $(all_includes) -I$(top_srcdir)
 122
 123  actor_JESS_la_LDFLAGS = -module -avoid-version
 124 +actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS)
 125
 126  actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\
 127                         distorsion.c distorsion.h\
 128 diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am
 129 --- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am       2006-02-23 20:03:28.000000000 +1100
 130 +++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am   2007-07-04 18:19:43.000000000 +1000
 131 @@ -2,14 +2,13 @@
 132
 133  actor_plugin_LTLIBRARIES = actor_lv_analyzer.la
 134
 135 -LIBS += $(LIBVISUAL_LIBS)
 136 -
 137  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 138
 139  INCLUDES = $(all_includes) \
 140         -I$(top_srcdir)
 141
 142  actor_lv_analyzer_la_LDFLAGS = -module -avoid-version
 143 +actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS)
 144
 145  actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c
 146
 147 diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am
 148 --- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am 2006-02-24 22:24:49.000000000 +1100
 149 +++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am     2007-07-04 18:19:43.000000000 +1000
 150 @@ -4,5 +4,5 @@
 151
 152  actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
 153  actor_lv_gltest_la_LDFLAGS = -module -avoid-version
 154 -actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
 155 +actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
 156  actor_lv_gltest_la_SOURCES = actor_lv_gltest.c
 157 diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am
 158 --- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am  2006-02-23 20:03:29.000000000 +1100
 159 +++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am      2007-07-04 18:19:43.000000000 +1000
 160 @@ -2,13 +2,12 @@
 161
 162  actor_plugin_LTLIBRARIES = actor_lv_scope.la
 163
 164 -LIBS += $(LIBVISUAL_LIBS)
 165 -
 166  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 167
 168  INCLUDES = $(all_includes) -I$(top_srcdir)
 169
 170  actor_lv_scope_la_LDFLAGS = -module -avoid-version
 171 +actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS)
 172
 173  actor_lv_scope_la_SOURCES = actor_lv_scope.c
 174
 175 diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am
 176 --- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am   2006-02-24 22:24:49.000000000 +1100
 177 +++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am       2007-07-04 18:19:43.000000000 +1000
 178 @@ -10,5 +10,5 @@
 179
 180  actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\"
 181  actor_madspin_la_LDFLAGS = -module -avoid-version
 182 -actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL
 183 +actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL
 184  actor_madspin_la_SOURCES = madspin.c
 185 diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am
 186 --- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am  2006-02-24 22:24:50.000000000 +1100
 187 +++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am      2007-07-04 18:19:43.000000000 +1000
 188 @@ -4,5 +4,5 @@
 189
 190  actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
 191  actor_nastyfft_la_LDFLAGS = -module -avoid-version
 192 -actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
 193 +actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
 194  actor_nastyfft_la_SOURCES = actor_nastyfft.c
 195 diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am
 196 --- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am   2006-02-23 20:03:31.000000000 +1100
 197 +++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am       2007-07-04 18:19:43.000000000 +1000
 198 @@ -2,13 +2,12 @@
 199
 200  actor_plugin_LTLIBRARIES = actor_oinksie.la
 201
 202 -LIBS += $(LIBVISUAL_LIBS)
 203 -
 204  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 205
 206  INCLUDES = $(all_includes) -I$(top_srcdir)
 207
 208  actor_oinksie_la_LDFLAGS = -module -avoid-version
 209 +actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS)
 210
 211  actor_oinksie_la_SOURCES = actor_oinksie.c\
 212                            oinksie.c oinksie.h\
 213 diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am
 214 --- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am 2006-03-09 00:06:58.000000000 +1100
 215 +++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am     2007-07-04 18:19:43.000000000 +1000
 216 @@ -4,7 +4,7 @@
 217
 218  actor_flower_la_LDFLAGS = -module -avoid-version
 219  actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
 220 -actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
 221 +actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
 222
 223  actor_flower_la_SOURCES = \
 224         actor_flower.c \
 225 diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am
 226 --- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am      2006-02-23 20:03:35.000000000 +1100
 227 +++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am  2007-07-04 18:19:43.000000000 +1000
 228 @@ -2,12 +2,11 @@
 229
 230  input_plugin_LTLIBRARIES = input_alsa.la
 231
 232 -LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS)
 233 -
 234  AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS)
 235
 236  INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
 237
 238  input_alsa_la_LDFLAGS = -module -avoid-version
 239 +input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS)
 240
 241  input_alsa_la_SOURCES = input_alsa.c
 242 diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am
 243 --- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am     2006-02-23 20:03:36.000000000 +1100
 244 +++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am 2007-07-04 18:19:43.000000000 +1000
 245 @@ -2,11 +2,10 @@
 246
 247  input_plugin_LTLIBRARIES = input_debug.la
 248
 249 -LIBS += $(LIBVISUAL_LIBS)
 250 -
 251  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 252
 253  INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
 254
 255  input_debug_la_LDFLAGS = -module -avoid-version
 256 +input_debug_la_LIBADD = $(LIBVISUAL_LIBS)
 257  input_debug_la_SOURCES = input_debug.c
 258 diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am
 259 --- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am       2006-02-23 20:03:37.000000000 +1100
 260 +++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am   2007-07-04 18:19:43.000000000 +1000
 261 @@ -2,11 +2,10 @@
 262
 263  input_plugin_LTLIBRARIES = input_esd.la
 264
 265 -LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
 266 -
 267  AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS)
 268
 269  INCLUDES = $(all_includes) -I$(top_srcdir)
 270
 271  input_esd_la_LDFLAGS = -module -avoid-version
 272 +input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
 273  input_esd_la_SOURCES = input_esd.c
 274 diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am
 275 --- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am      2006-02-23 20:03:37.000000000 +1100
 276 +++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am  2007-07-04 18:19:43.000000000 +1000
 277 @@ -2,13 +2,12 @@
 278
 279  input_plugin_LTLIBRARIES = input_jack.la
 280
 281 -LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
 282 -
 283  AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS)
 284
 285  INCLUDES = $(all_includes) -I$(top_srcdir)
 286
 287  input_jack_la_LDFLAGS = -module -avoid-version
 288 +input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
 289
 290  input_jack_la_SOURCES = input_jack.c
 291
 292 diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am
 293 --- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am   2006-02-23 20:03:38.000000000 +1100
 294 +++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am       2007-07-04 18:19:43.000000000 +1000
 295 @@ -2,12 +2,11 @@
 296
 297  input_plugin_LTLIBRARIES = input_mplayer.la
 298
 299 -LIBS += $(LIBVISUAL_LIBS)
 300 -
 301  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 302
 303  INCLUDES = $(all_includes) -I$(top_srcdir)
 304
 305  input_mplayer_la_LDFLAGS = -module -avoid-version
 306 +input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS)
 307  input_mplayer_la_SOURCES = input_mplayer.c
 308
 309 diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am
 310 --- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am        2006-02-23 20:03:38.000000000 +1100
 311 +++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am    2007-07-04 18:19:43.000000000 +1000
 312 @@ -2,11 +2,10 @@
 313
 314  morph_plugin_LTLIBRARIES = morph_alphablend.la
 315
 316 -LIBS += $(LIBVISUAL_LIBS)
 317 -
 318  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 319
 320  INCLUDES = $(all_includes) -I$(top_srcdir)
 321
 322  morph_alphablend_la_LDFLAGS = -module -avoid-version
 323 +morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS)
 324  morph_alphablend_la_SOURCES = morph_alphablend.c
 325 diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am
 326 --- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am     2006-02-23 20:03:39.000000000 +1100
 327 +++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am 2007-07-04 18:19:43.000000000 +1000
 328 @@ -2,11 +2,10 @@
 329
 330  morph_plugin_LTLIBRARIES = morph_flash.la
 331
 332 -LIBS += $(LIBVISUAL_LIBS)
 333 -
 334  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 335
 336  INCLUDES = $(all_includes) -I$(top_srcdir)
 337
 338  morph_flash_la_LDFLAGS = -module -avoid-version
 339 +morph_flash_la_LIBADD = $(LIBVISUAL_LIBS)
 340  morph_flash_la_SOURCES = morph_flash.c
 341 diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am
 342 --- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am     2006-02-23 20:03:39.000000000 +1100
 343 +++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am 2007-07-04 18:19:43.000000000 +1000
 344 @@ -2,11 +2,10 @@
 345
 346  morph_plugin_LTLIBRARIES = morph_slide.la
 347
 348 -LIBS += $(LIBVISUAL_LIBS)
 349 -
 350  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 351
 352  INCLUDES = $(all_includes) -I$(top_srcdir)
 353
 354  morph_slide_la_LDFLAGS = -module -avoid-version
 355 +morph_slide_la_LIBADD = $(LIBVISUAL_LIBS)
 356  morph_slide_la_SOURCES = morph_slide.c
 357 diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am
 358 --- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am  2006-02-23 20:03:39.000000000 +1100
 359 +++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am      2007-07-04 18:19:43.000000000 +1000
 360 @@ -2,11 +2,10 @@
 361
 362  morph_plugin_LTLIBRARIES = morph_tentacle.la
 363
 364 -LIBS += $(LIBVISUAL_LIBS)
 365 -
 366  AM_CFLAGS = $(LIBVISUAL_CFLAGS)
 367
 368  INCLUDES = $(all_includes) -I$(top_srcdir)
 369
 370  morph_tentacle_la_LDFLAGS = -module -avoid-version
 371 +morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS)
 372  morph_tentacle_la_SOURCES = morph_tentacle.c