[gnome-settings-daemon] plugins: Use LIBM macro instead of hard-coding it



commit ed3a453694bbac35056a6974e180588713b22b26
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Sep 29 14:41:51 2016 +0200

    plugins: Use LIBM macro instead of hard-coding it
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772370

 plugins/color/Makefile.am      |    2 +-
 plugins/media-keys/Makefile.am |    3 ++-
 plugins/mouse/Makefile.am      |    5 +++--
 plugins/power/Makefile.am      |    6 +++---
 plugins/wacom/Makefile.am      |   10 +++++-----
 5 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index 702c38c..8fc729a 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -20,7 +20,7 @@ gcm_self_test_SOURCES =                       \
 gcm_self_test_LDADD =                  \
        $(COLOR_LIBS)                   \
        $(SETTINGS_PLUGIN_LIBS)         \
-       -lm
+       $(LIBM)
 
 TESTS = gcm-self-test
 
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 3b860bc..6f7d88f 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -72,7 +72,8 @@ gsd_media_keys_LDADD = \
        $(top_builddir)/gnome-settings-daemon/libgsd.la         \
        $(top_builddir)/plugins/common/libcommon.la             \
        $(top_builddir)/plugins/media-keys/gvc/libgvc.la        \
-       $(MEDIA_KEYS_LIBS) -lm
+       $(MEDIA_KEYS_LIBS)                                      \
+       $(LIBM)
 
 EXTRA_DIST =                           \
        gsd-marshal.list                \
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index d30470e..fa095c3 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -17,7 +17,7 @@ gsd_locate_pointer_SOURCES =  \
 
 gsd_locate_pointer_CFLAGS = $(MOUSE_LOCATE_POINTER_CFLAGS)
 
-gsd_locate_pointer_LDADD  = $(MOUSE_LOCATE_POINTER_LIBS) -lm
+gsd_locate_pointer_LDADD  = $(MOUSE_LOCATE_POINTER_LIBS) $(LIBM)
 
 libexec_PROGRAMS += gsd-mouse
 
@@ -42,7 +42,8 @@ gsd_mouse_CFLAGS =            \
 gsd_mouse_LDADD =                                              \
        $(top_builddir)/gnome-settings-daemon/libgsd.la         \
        $(top_builddir)/plugins/common/libcommon.la             \
-       $(MOUSE_LIBS) -lm
+       $(MOUSE_LIBS)                                           \
+       $(LIBM)
 
 EXTRA_DIST = $(desktop_in_files)
 CLEANFILES = $(desktop_DATA)
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index 816cc4d..336dd56 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -53,10 +53,10 @@ gsd_power_CPPFLAGS =                                        \
        $(AM_CPPFLAGS)
 
 gsd_power_LDADD =                                      \
-       -lm                                             \
        $(top_builddir)/plugins/common/libcommon.la     \
        $(top_builddir)/gnome-settings-daemon/libgsd.la \
-       $(POWER_LIBS)
+       $(POWER_LIBS)                                   \
+       $(LIBM)
 
 EXTRA_DIST =                                           \
        $(desktop_in_files)                             \
@@ -68,7 +68,7 @@ libexec_PROGRAMS = gsd-backlight-helper
 
 gsd_backlight_helper_LDFLAGS =                         \
        $(BACKLIGHT_HELPER_LIBS)                        \
-       -lm
+       $(LIBM)
 
 gsd_backlight_helper_CFLAGS =                          \
        $(BACKLIGHT_HELPER_CFLAGS)
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 0180711..869ac3e 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -28,11 +28,11 @@ libexec_PROGRAMS = gsd-wacom-led-helper gsd-wacom-oled-helper
 
 gsd_wacom_led_helper_LDFLAGS =                         \
        $(BACKLIGHT_HELPER_LIBS)                        \
-       -lm
+       $(LIBM)
 
 gsd_wacom_oled_helper_LDFLAGS =                                \
        $(WACOM_OLED_LIBS)                              \
-       -lm
+       $(LIBM)
 
 gsd_wacom_led_helper_CFLAGS =                          \
        $(BACKLIGHT_HELPER_CFLAGS)
@@ -82,7 +82,7 @@ gsd_wacom_LDADD =                                             \
        $(top_builddir)/gnome-settings-daemon/libgsd.la         \
        $(top_builddir)/plugins/common/libcommon.la             \
        $(WACOM_LIBS)                                           \
-       -lm
+       $(LIBM)
 
 gsd_list_wacom_SOURCES =       \
        list-wacom.c            \
@@ -105,7 +105,7 @@ gsd_list_wacom_LDADD =                                              \
        $(top_builddir)/gnome-settings-daemon/libgsd.la         \
        $(top_builddir)/plugins/common/libcommon.la             \
        $(WACOM_LIBS)                                           \
-       -lm
+       $(LIBM)
 
 gsd_test_wacom_osd_SOURCES =                                   \
        test-osd-window.c                                       \
@@ -137,7 +137,7 @@ gsd_test_wacom_osd_LDADD = \
        $(top_builddir)/gnome-settings-daemon/libgsd.la         \
        $(top_builddir)/plugins/common/libcommon.la             \
        $(WACOM_LIBS)                                           \
-       -lm
+       $(LIBM)
 
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = org.gnome.SettingsDaemon.Wacom.desktop.in


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