[gnome-dictionary] build: Use $(LIBM) instead of -lm



commit ea2b2eba9e95e93152be62af1198532ae1bd4c2c
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Mar 1 16:46:49 2015 +0000

    build: Use $(LIBM) instead of -lm
    
    The $(LIBM) variable is set by the LT_LIB_M macro.

 src/Makefile.am |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 33500de..080fdf1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,15 +3,23 @@ NULL =
 bin_PROGRAMS = gnome-dictionary
 
 gnome_dictionary_CPPFLAGS = \
-       -DPREFIX=\""$(prefix)"\"                        \
-       -DSYSCONFDIR=\""$(sysconfdir)"\"                \
-       -DLIBDIR=\""$(libdir)"\"                        \
-       -DDATADIR=\""$(datadir)"\"                      \
-       -DUIDATADIR=\""$(datadir)/gnome-2.0/ui"\"       \
-       -DPKGDATADIR=\""$(datadir)/gnome-dictionary"\"  \
+       -DPREFIX=\""$(prefix)"\" \
+       -DSYSCONFDIR=\""$(sysconfdir)"\" \
+       -DLIBDIR=\""$(libdir)"\" \
+       -DDATADIR=\""$(datadir)"\" \
+       -DUIDATADIR=\""$(datadir)/gnome-2.0/ui"\" \
+       -DPKGDATADIR=\""$(datadir)/gnome-dictionary"\" \
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        $(NULL)
 
+gnome_dictionary_CFLAGS = \
+       -I$(top_builddir) \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/libgdict \
+       -I$(top_builddir)/libgdict \
+       $(GDICT_CFLAGS) \
+       $(NULL)
+
 gnome_dictionary_SOURCES = \
        gdict-about.c           \
        gdict-about.h           \
@@ -32,20 +40,7 @@ gnome_dictionary_SOURCES = \
        main.c                  \
        $(NULL)
 
-gnome_dictionary_CFLAGS = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_srcdir)/libgdict        \
-       -I$(top_builddir)/libgdict      \
-       $(GDICT_CFLAGS)         \
-       $(NULL)
-
-gnome_dictionary_LDADD = \
-       -lm                     \
-       $(top_builddir)/libgdict/libgdict-1.0.la \
-       $(GDICT_LIBS)           \
-       $(NULL)
-
+gnome_dictionary_LDADD = $(top_builddir)/libgdict/libgdict-1.0.la $(GDICT_LIBS) $(LIBM)
 gnome_dictionary_DEPENDENCIES = $(top_builddir)/libgdict/libgdict-1.0.la
 
 -include $(top_srcdir)/git.mk


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