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'.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/Makemodule.am b/src/Makemodule.am
index c9e41ec..2fd5891 100644
--- a/src/Makemodule.am
+++ b/src/Makemodule.am
@@ -25,6 +25,8 @@
 BUILT_SOURCES = src/defaults.hh src/defaults.cc
 CONFIG_CLEAN_FILES = src/defaults.hh src/defaults.cc
 
+LDADD = libFbTk.a src/defaults.$(OBJEXT)
+
 bin_PROGRAMS += fluxbox
 
 src/defaults.hh:
@@ -138,13 +140,13 @@ fluxbox_CPPFLAGS = \
         -I$(fbtk_incdir) \
         -I$(nls_incdir)
 
-fluxbox_LDFLAGS = \
+fluxbox_LDADD = \
+        $(LDADD) \
         $(FONTCONFIG_LIBS) \
         $(FREETYPE2_LIBS) \
         $(FRIBIDI_LIBS) \
         $(IMLIB2_LIBS) \
         $(RANDR_LIBS) \
-        $(X11_LIBS) \
         $(XEXT_LIBS) \
         $(XFT_LIBS) \
         $(XINERAMA_LIBS) \
@@ -152,7 +154,8 @@ fluxbox_LDFLAGS = \
         $(XRENDER_LIBS) \
         $(X_EXTRA_LIBS) \
         $(X_LIBS) \
-        $(X_PRE_LIBS)
+        $(X_PRE_LIBS) \
+        $(X11_LIBS)
 
 fluxbox_SOURCES = \
         src/AlphaMenu.cc \
@@ -272,4 +275,3 @@ fluxbox_SOURCES = \
         ${SLIT_SOURCE} \
         ${TOOLBAR_SOURCE}
 
-LDADD = libFbTk.a src/defaults.$(OBJEXT)