[clutter-gst/clutter-gst-2.0] tests, examples: fix LDFLAGS vs LDADD use



commit 3dee125e7590e331a1cd98eee3d8c698e8554718
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Feb 11 13:41:43 2014 -0500

    tests, examples: fix LDFLAGS vs LDADD use
    
    Extra libraries to link belong in LDADD, not LDFLAGS.
    
    This fixes the build under jhbuild on FreeBSD.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724189

 examples/Makefile.am |    6 +++---
 tests/Makefile.am    |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4cd466b..8d513ec 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -8,21 +8,21 @@ INCLUDES = -I$(top_srcdir) \
 
 video_player_SOURCES = video-player.c
 video_player_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_player_LDFLAGS = \
+video_player_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst- CLUTTER_GST_MAJORMINOR@.la
 
 video_sink_SOURCES = video-sink.c
 video_sink_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_sink_LDFLAGS = \
+video_sink_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst- CLUTTER_GST_MAJORMINOR@.la
 
 video_sink_navigation_SOURCES = video-sink-navigation.c
 video_sink_navigation_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-video_sink_navigation_LDFLAGS = \
+video_sink_navigation_LDADD = \
     $(CLUTTER_GST_LIBS) \
     $(GST_LIBS)   \
     $(top_builddir)/clutter-gst/libclutter-gst- CLUTTER_GST_MAJORMINOR@.la
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 59fc3ba..aa779ed 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,35 +14,35 @@ INCLUDES = -I$(top_srcdir)      \
 
 test_alpha_SOURCES = test-alpha.c
 test_alpha_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_alpha_LDFLAGS =           \
+test_alpha_LDADD =             \
        $(CLUTTER_GST_LIBS)     \
        $(GST_LIBS)             \
        $(top_builddir)/clutter-gst/libclutter-gst- CLUTTER_GST_MAJORMINOR@.la
 
 test_rgb_upload_SOURCES = test-rgb-upload.c
 test_rgb_upload_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_rgb_upload_LDFLAGS =      \
+test_rgb_upload_LDADD =        \
        $(CLUTTER_GST_LIBS)     \
        $(GST_LIBS)             \
        $(top_builddir)/clutter-gst/libclutter-gst- CLUTTER_GST_MAJORMINOR@.la
 
 test_start_stop_SOURCES = test-start-stop.c
 test_start_stop_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_start_stop_LDFLAGS =      \
+test_start_stop_LDADD =        \
        $(CLUTTER_GST_LIBS)     \
        $(GST_LIBS)             \
        $(top_builddir)/clutter-gst/libclutter-gst- CLUTTER_GST_MAJORMINOR@.la
 
 test_yuv_upload_SOURCES = test-yuv-upload.c
 test_yuv_upload_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_yuv_upload_LDFLAGS =      \
+test_yuv_upload_LDADD =        \
        $(CLUTTER_GST_LIBS)     \
        $(GST_LIBS)             \
        $(top_builddir)/clutter-gst/libclutter-gst- CLUTTER_GST_MAJORMINOR@.la
 
 test_video_texture_new_unref_loop_SOURCES = test-video-texture-new-unref-loop.c
 test_video_texture_new_unref_loop_CFLAGS  = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-test_video_texture_new_unref_loop_LDFLAGS =    \
+test_video_texture_new_unref_loop_LDADD =      \
        $(CLUTTER_GST_LIBS)                     \
        $(GST_LIBS)                             \
        $(top_builddir)/clutter-gst/libclutter-gst- CLUTTER_GST_MAJORMINOR@.la


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