[cogl] Add $(LIBM) to the LDADD for all of the examples and tests



commit 66a1aeaee1f7cdcdd505f5745277723a43d714b6
Author: Neil Roberts <neil linux intel com>
Date:   Tue Apr 23 17:40:38 2013 +0100

    Add $(LIBM) to the LDADD for all of the examples and tests
    
    Some of the examples and tests are using functions from -lm. With some
    linkers, if we don't expicitly link against it an error will be
    reported. This patch adds the library to all of the examples even
    though not all of them use math functions because I don't think it
    will do any harm and it will save us having to remember to add it if
    an example later starts using some math functions.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=697330
    
    Reviewed-by: Robert Bragg <robert linux intel com>

 examples/Makefile.am         |    3 ++-
 tests/conform/Makefile.am    |    5 ++++-
 tests/micro-perf/Makefile.am |    7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 94f6c3c..87deb28 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -19,7 +19,8 @@ endif
 
 common_ldadd = \
        $(COGL_DEP_LIBS) \
-       $(top_builddir)/cogl/libcogl2.la
+       $(top_builddir)/cogl/libcogl2.la \
+       $(LIBM)
 
 if !USE_GLIB
 common_ldadd += $(top_builddir)/deps/glib/libglib.la
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index e810a0c..d5c25db 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -130,7 +130,10 @@ AM_CPPFLAGS += \
        -DCOGL_COMPILATION
 
 test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
-test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl2.la
+test_conformance_LDADD = \
+       $(COGL_DEP_LIBS) \
+       $(top_builddir)/cogl/libcogl2.la \
+       $(LIBM)
 if !USE_GLIB
 test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la
 endif
diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am
index ddca610..3a21ee9 100644
--- a/tests/micro-perf/Makefile.am
+++ b/tests/micro-perf/Makefile.am
@@ -19,5 +19,10 @@ endif
 
 AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
 
+common_ldadd = \
+       $(COGL_DEP_LIBS) \
+       $(top_builddir)/cogl/libcogl2.la \
+       $(LIBM)
+
 test_journal_SOURCES = test-journal.c
-test_journal_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl2.la
+test_journal_LDADD = $(common_ldadd)


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