diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | panels/color/Makefile.am | 2 | ||||
| -rw-r--r-- | panels/datetime/Makefile.am | 4 | ||||
| -rw-r--r-- | panels/display/Makefile.am | 2 | ||||
| -rw-r--r-- | panels/mouse/Makefile.am | 4 | ||||
| -rw-r--r-- | panels/printers/Makefile.am | 2 | ||||
| -rw-r--r-- | panels/sound/Makefile.am | 2 | ||||
| -rw-r--r-- | panels/universal-access/Makefile.am | 2 | ||||
| -rw-r--r-- | panels/user-accounts/Makefile.am | 2 | ||||
| -rw-r--r-- | panels/wacom/calibrator/Makefile.am | 5 |
10 files changed, 14 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index b1c5e042f..6e35c0081 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,8 @@ AC_SUBST(XF86MISC_LIBS) AC_CHECK_HEADERS(X11/extensions/XKB.h) CPPFLAGS=$savecppflags -AC_CHECK_LIB(m, floor) +AC_CHECK_LIBM +AC_SUBST(LIBM) # IBus support IBUS_REQUIRED_VERSION=1.5.2 diff --git a/panels/color/Makefile.am b/panels/color/Makefile.am index ce0582fe7..a003f8a49 100644 --- a/panels/color/Makefile.am +++ b/panels/color/Makefile.am @@ -30,7 +30,7 @@ libcolor_la_SOURCES = \ cc-color-panel.c \ cc-color-panel.h -libcolor_la_LIBADD = $(PANEL_LIBS) $(COLOR_PANEL_LIBS) +libcolor_la_LIBADD = $(PANEL_LIBS) $(COLOR_PANEL_LIBS) $(LIBM) resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/color.gresource.xml) cc-color-resources.c: color.gresource.xml $(resource_files) diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am index 43523a6ee..a003f0bce 100644 --- a/panels/datetime/Makefile.am +++ b/panels/datetime/Makefile.am @@ -30,11 +30,11 @@ noinst_PROGRAMS = $(TEST_PROGS) test-timezone TEST_PROGS += test-timezone-gfx test-endianess test_timezone_SOURCES = test-timezone.c cc-timezone-map.h cc-timezone-map.c tz.c tz.h cc-datetime-resources.c cc-datetime-resources.h -test_timezone_LDADD = $(DATETIME_PANEL_LIBS) -lm +test_timezone_LDADD = $(DATETIME_PANEL_LIBS) $(LIBM) test_timezone_CFLAGS = $(DATETIME_PANEL_CFLAGS) test_timezone_gfx_SOURCES = test-timezone-gfx.c tz.c tz.h cc-datetime-resources.c cc-datetime-resources.h -test_timezone_gfx_LDADD = $(DATETIME_PANEL_LIBS) -lm +test_timezone_gfx_LDADD = $(DATETIME_PANEL_LIBS) $(LIBM) test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS) -DSRCDIR="\"$(srcdir)\"" test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h diff --git a/panels/display/Makefile.am b/panels/display/Makefile.am index 94020448a..c03696f0f 100644 --- a/panels/display/Makefile.am +++ b/panels/display/Makefile.am @@ -9,7 +9,7 @@ libdisplay_la_SOURCES = \ scrollarea.c \ scrollarea.h -libdisplay_la_LIBADD = $(PANEL_LIBS) $(DISPLAY_PANEL_LIBS) +libdisplay_la_LIBADD = $(PANEL_LIBS) $(DISPLAY_PANEL_LIBS) $(LIBM) # You will need a recent intltool or the patch from this bug # http://bugzilla.gnome.org/show_bug.cgi?id=462312 diff --git a/panels/mouse/Makefile.am b/panels/mouse/Makefile.am index 9e113d51d..aa86e0ab7 100644 --- a/panels/mouse/Makefile.am +++ b/panels/mouse/Makefile.am @@ -25,7 +25,7 @@ libmouse_properties_la_SOURCES = \ gnome-mouse-test.c \ gnome-mouse-test.h -libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) $(top_builddir)/panels/common/libdevice.la +libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) $(LIBM) $(top_builddir)/panels/common/libdevice.la test_gnome_mouse_test_SOURCES = \ $(BUILT_SOURCES) \ @@ -36,7 +36,7 @@ test_gnome_mouse_test_SOURCES = \ noinst_PROGRAMS = test-gnome-mouse-test test_gnome_mouse_test_CPPFLAGS = $(AM_CPPFLAGS) -test_gnome_mouse_test_LDADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) +test_gnome_mouse_test_LDADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) $(LIBM) resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/mouse.gresource.xml) cc-mouse-resources.c: mouse.gresource.xml $(resource_files) diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am index ef23deb8c..fad9d0939 100644 --- a/panels/printers/Makefile.am +++ b/panels/printers/Makefile.am @@ -54,7 +54,7 @@ libprinters_la_SOURCES = \ cc-printers-panel.h libprinters_la_CPPFLAGS = $(AM_CPPFLAGS) -libprinters_la_LIBADD = $(PRINTERS_PANEL_LIBS) $(PANEL_LIBS) $(CUPS_LIBS) $(SMBCLIENT_LIBS) +libprinters_la_LIBADD = $(PRINTERS_PANEL_LIBS) $(PANEL_LIBS) $(CUPS_LIBS) $(SMBCLIENT_LIBS) $(LIBM) resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/printers.gresource.xml) cc-printers-resources.c: printers.gresource.xml $(resource_files) diff --git a/panels/sound/Makefile.am b/panels/sound/Makefile.am index 1f152b656..709007f8b 100644 --- a/panels/sound/Makefile.am +++ b/panels/sound/Makefile.am @@ -27,11 +27,11 @@ libgvcgtk_la_SOURCES = \ $(NULL) libsound_la_LIBADD = \ - -lm \ gvc/libgvc.la \ libgvcgtk.la \ $(PANEL_LIBS) \ $(SOUND_PANEL_LIBS) \ + $(LIBM) \ $(NULL) libsound_la_LDFLAGS = \ diff --git a/panels/universal-access/Makefile.am b/panels/universal-access/Makefile.am index 5fcc983c0..b0efc5ebf 100644 --- a/panels/universal-access/Makefile.am +++ b/panels/universal-access/Makefile.am @@ -20,7 +20,7 @@ libuniversal_access_la_SOURCES = \ zoom-options.c \ zoom-options.h -libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(UNIVERSAL_ACCESS_PANEL_LIBS) +libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(UNIVERSAL_ACCESS_PANEL_LIBS) $(LIBM) resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/universal-access.gresource.xml) cc-ua-resources.c: universal-access.gresource.xml $(resource_files) diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am index eff4d670c..65d422f37 100644 --- a/panels/user-accounts/Makefile.am +++ b/panels/user-accounts/Makefile.am @@ -64,7 +64,7 @@ libuser_accounts_la_LIBADD = \ $(builddir)/../common/liblanguage.la \ -lpwquality \ -lcrypt \ - -lm \ + $(LIBM) \ $(top_builddir)/libgd/libgd.la if BUILD_CHEESE diff --git a/panels/wacom/calibrator/Makefile.am b/panels/wacom/calibrator/Makefile.am index 4559aef14..38e9e827b 100644 --- a/panels/wacom/calibrator/Makefile.am +++ b/panels/wacom/calibrator/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ $(NULL) - noinst_LTLIBRARIES = libwacom-calibrator.la libwacom-calibrator-test.la libwacom_calibrator_la_SOURCES = \ @@ -20,7 +19,7 @@ libwacom_calibrator_la_SOURCES = \ cc-target-actor.c \ cc-target-actor.h -libwacom_calibrator_la_LIBADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) +libwacom_calibrator_la_LIBADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(LIBM) libwacom_calibrator_la_LDFLAGS = $(PANEL_LDFLAGS) libwacom_calibrator_test_la_SOURCES = $(libwacom_calibrator_la_SOURCES) @@ -43,6 +42,6 @@ test_calibrator_SOURCES = \ cc-target-actor.h test_calibrator_CPPFLAGS = $(AM_CPPFLAGS) -test_calibrator_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) +test_calibrator_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(LIBM) -include $(top_srcdir)/git.mk |