1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399
|
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-0.4.0+dfsg1/plugins/actor/bumpscope/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/bumpscope/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/corona/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/corona/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/gdkpixbuf/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/gdkpixbuf/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/gstreamer/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/gstreamer/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/infinite/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/infinite/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/jakdaw/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/jakdaw/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/JESS/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/JESS/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/lv_analyzer/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/lv_analyzer/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/lv_gltest/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/lv_gltest/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/lv_scope/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/lv_scope/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/madspin/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/madspin/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/nastyfft/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/nastyfft/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/oinksie/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/oinksie/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/actor/pseudotoad_flower/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/actor/pseudotoad_flower/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/input/alsa/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/input/alsa/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/input/debug/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/input/debug/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/input/esd/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/input/esd/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/input/jack/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/input/jack/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/input/mplayer/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/input/mplayer/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/morph/alphablend/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/morph/alphablend/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/morph/flash/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/morph/flash/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/morph/slide/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/morph/slide/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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-0.4.0+dfsg1/plugins/morph/tentacle/Makefile.am
===================================================================
--- libvisual-plugins-0.4.0+dfsg1.orig/plugins/morph/tentacle/Makefile.am
+++ libvisual-plugins-0.4.0+dfsg1/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
|