[gimp/gimp-2-8] tests: link against -lm



commit f60570b3125c8dfd73b531c51ecf0017f2e5b1f0
Author: Nils Philippsen <nils redhat com>
Date:   Thu Jul 16 14:18:55 2015 +0200

    tests: link against -lm
    
    (see commit 4c7338c0974096dca8566a1d570ed51fbe721ae6)
    
    (cherry picked from commit 9171de3b80735cd608b5ac099c67deb5b9ccaf1f)

 app/config/Makefile.am |    8 +++++++-
 app/tests/Makefile.am  |    8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 8012c01..5ba7704 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -7,6 +7,11 @@ libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
 libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
 libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
 
+if OS_WIN32
+else
+libm = -lm
+endif
+
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Gimp-Config\"  \
        -DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"
@@ -111,7 +116,8 @@ test_config_LDADD = \
        $(PANGOCAIRO_LIBS)                      \
        $(GDK_PIXBUF_LIBS)                      \
        $(GEGL_LIBS)                            \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS)                            \
+       $(libm)
 
 CLEANFILES = $(EXTRA_PROGRAMS) foorc
 
diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am
index 821b76c..96b9550 100644
--- a/app/tests/Makefile.am
+++ b/app/tests/Makefile.am
@@ -51,6 +51,11 @@ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).
 libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
 libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
 
+if OS_WIN32
+else
+libm = -lm
+endif
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/app     \
@@ -127,7 +132,8 @@ LDADD = \
        $(GEGL_LIBS)                                            \
        $(GLIB_LIBS)                                            \
        $(INTLLIBS)                                             \
-       $(RT_LIBS)
+       $(RT_LIBS)                                                      \
+       $(libm)
 
 gimpdir-output:
        mkdir -p gimpdir-output


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