Fix build-system: use xxx_LDADD instead of xxx_LDFLAGS

xxx_LDFLAGS place the libraries like '-lX11' or '-lXft' at the beginning of
the linker command. Some systems were not able to handle the situation and
this lead to a lot of unresolved symbols. Reading the documentation of
automake:

    ... you can use LDADD to do so. This variable is used to specify
    additional objects or libraries to link with; it is inappropriate for
    specifying specific linker flags, you should use AM_LDFLAGS for this
    purpose.

In addition we link against -lm in order to satisfy symbols refering to 'cos'
and 'sin'.

2 files changed, 14 insertions, 16 deletions

diff --git a/util/Makemodule.am b/util/Makemodule.am
index 44f3002..b022f10 100644
--- a/util/Makemodule.am
+++ b/util/Makemodule.am
@@ -21,19 +21,19 @@ fbsetroot_SOURCES = \
         util/fbsetroot.cc \
         util/fbsetroot.hh
 fbsetroot_LDADD = \
-        libFbTk.a
-fbsetroot_CPPFLAGS = \
-        $(AM_CPPFLAGS) \
-        -I$(fbtk_incdir) \
-        -I$(src_incdir) \
-        -I$(nls_incdir)
-fbsetroot_LDFLAGS = \
+        libFbTk.a \
         $(FONTCONFIG_LIBS) \
         $(FRIBIDI_LIBS) \
         $(X11_LIBS) \
         $(XFT_LIBS) \
         $(XRENDER_LIBS)
 
+fbsetroot_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir) \
+        -I$(src_incdir) \
+        -I$(nls_incdir)
+
 fluxbox_update_configs_SOURCES = \
         src/defaults.cc \
         src/Resources.cc \
@@ -44,8 +44,7 @@ fluxbox_update_configs_CPPFLAGS = \
         -I$(src_incdir) \
         -I$(nls_incdir)
 fluxbox_update_configs_LDADD = \
-        libFbTk.a
-fluxbox_update_configs_LDFLAGS = \
+        libFbTk.a \
         $(FRIBIDI_LIBS) \
         $(X11_LIBS)
 
@@ -54,5 +53,5 @@ fluxbox_remote_SOURCES = \
 fluxbox_remote_CPPFLAGS = \
         $(AM_CPPFLAGS) \
         -I$(fbtk_incdir)
-fluxbox_remote_LDFLAGS = \
+fluxbox_remote_LDADD = \
         $(X11_LIBS)
diff --git a/util/fbrun/Makemodule.am b/util/fbrun/Makemodule.am
index f730ac8..ddeeafb 100644
--- a/util/fbrun/Makemodule.am
+++ b/util/fbrun/Makemodule.am
@@ -10,13 +10,12 @@ fbrun_SOURCES = \
         util/fbrun/main.cc \
         util/fbrun/fbrun.xpm
 
-fbrun_LDADD = libFbTk.a
-
-fbrun_LDFLAGS = \
-        $(FONTCONFIG_LIBS) \
+fbrun_LDADD = libFbTk.a \
         $(FRIBIDI_LIBS) \
-        $(X11_LIBS) \
+        $(FONTCONFIG_LIBS) \
+    $(FREETYEP_LIBS) \
         $(XFT_LIBS) \
         $(XINERAMA_LIBS) \
         $(XPM_LIBS) \
-        $(XRENDER_LIBS)
+        $(XRENDER_LIBS) \
+        $(X11_LIBS)