aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorMathias Gumz <akira@fluxbox.org>2015-01-04 15:21:02 (GMT)
committerMathias Gumz <akira@fluxbox.org>2015-01-04 15:21:02 (GMT)
commit0820bcb640e9030a99a4c47119df6b9305e632da (patch)
treee040502e0c5a058e8544f5235e99c04d054c0eab /util
parentad968e32b30ee6262574bc3e02b20d5b117f5b88 (diff)
downloadfluxbox-0820bcb640e9030a99a4c47119df6b9305e632da.zip
fluxbox-0820bcb640e9030a99a4c47119df6b9305e632da.tar.bz2
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'.
Diffstat (limited to 'util')
-rw-r--r--util/Makemodule.am19
-rw-r--r--util/fbrun/Makemodule.am11
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 = \
21 util/fbsetroot.cc \ 21 util/fbsetroot.cc \
22 util/fbsetroot.hh 22 util/fbsetroot.hh
23fbsetroot_LDADD = \ 23fbsetroot_LDADD = \
24 libFbTk.a 24 libFbTk.a \
25fbsetroot_CPPFLAGS = \
26 $(AM_CPPFLAGS) \
27 -I$(fbtk_incdir) \
28 -I$(src_incdir) \
29 -I$(nls_incdir)
30fbsetroot_LDFLAGS = \
31 $(FONTCONFIG_LIBS) \ 25 $(FONTCONFIG_LIBS) \
32 $(FRIBIDI_LIBS) \ 26 $(FRIBIDI_LIBS) \
33 $(X11_LIBS) \ 27 $(X11_LIBS) \
34 $(XFT_LIBS) \ 28 $(XFT_LIBS) \
35 $(XRENDER_LIBS) 29 $(XRENDER_LIBS)
36 30
31fbsetroot_CPPFLAGS = \
32 $(AM_CPPFLAGS) \
33 -I$(fbtk_incdir) \
34 -I$(src_incdir) \
35 -I$(nls_incdir)
36
37fluxbox_update_configs_SOURCES = \ 37fluxbox_update_configs_SOURCES = \
38 src/defaults.cc \ 38 src/defaults.cc \
39 src/Resources.cc \ 39 src/Resources.cc \
@@ -44,8 +44,7 @@ fluxbox_update_configs_CPPFLAGS = \
44 -I$(src_incdir) \ 44 -I$(src_incdir) \
45 -I$(nls_incdir) 45 -I$(nls_incdir)
46fluxbox_update_configs_LDADD = \ 46fluxbox_update_configs_LDADD = \
47 libFbTk.a 47 libFbTk.a \
48fluxbox_update_configs_LDFLAGS = \
49 $(FRIBIDI_LIBS) \ 48 $(FRIBIDI_LIBS) \
50 $(X11_LIBS) 49 $(X11_LIBS)
51 50
@@ -54,5 +53,5 @@ fluxbox_remote_SOURCES = \
54fluxbox_remote_CPPFLAGS = \ 53fluxbox_remote_CPPFLAGS = \
55 $(AM_CPPFLAGS) \ 54 $(AM_CPPFLAGS) \
56 -I$(fbtk_incdir) 55 -I$(fbtk_incdir)
57fluxbox_remote_LDFLAGS = \ 56fluxbox_remote_LDADD = \
58 $(X11_LIBS) 57 $(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 = \
10 util/fbrun/main.cc \ 10 util/fbrun/main.cc \
11 util/fbrun/fbrun.xpm 11 util/fbrun/fbrun.xpm
12 12
13fbrun_LDADD = libFbTk.a 13fbrun_LDADD = libFbTk.a \
14
15fbrun_LDFLAGS = \
16 $(FONTCONFIG_LIBS) \
17 $(FRIBIDI_LIBS) \ 14 $(FRIBIDI_LIBS) \
18 $(X11_LIBS) \ 15 $(FONTCONFIG_LIBS) \
16 $(FREETYEP_LIBS) \
19 $(XFT_LIBS) \ 17 $(XFT_LIBS) \
20 $(XINERAMA_LIBS) \ 18 $(XINERAMA_LIBS) \
21 $(XPM_LIBS) \ 19 $(XPM_LIBS) \
22 $(XRENDER_LIBS) 20 $(XRENDER_LIBS) \
21 $(X11_LIBS)