aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--src/Makemodule.am10
-rw-r--r--util/Makemodule.am19
-rw-r--r--util/fbrun/Makemodule.am11
4 files changed, 24 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index 65ee23e..33217ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,10 @@ AC_CHECK_FUNCS([ \
129 vsnprintf \ 129 vsnprintf \
130]) 130])
131 131
132AC_CHECK_LIBM
133AC_SUBST(LIBM)
134LIBS="$LIBS $LIBM"
135
132dnl Windows requires the mingw-catgets library for the catgets function. 136dnl Windows requires the mingw-catgets library for the catgets function.
133AC_SEARCH_LIBS([catgets], [catgets], [], []) 137AC_SEARCH_LIBS([catgets], [catgets], [], [])
134 138
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 @@
25BUILT_SOURCES = src/defaults.hh src/defaults.cc 25BUILT_SOURCES = src/defaults.hh src/defaults.cc
26CONFIG_CLEAN_FILES = src/defaults.hh src/defaults.cc 26CONFIG_CLEAN_FILES = src/defaults.hh src/defaults.cc
27 27
28LDADD = libFbTk.a src/defaults.$(OBJEXT)
29
28bin_PROGRAMS += fluxbox 30bin_PROGRAMS += fluxbox
29 31
30src/defaults.hh: 32src/defaults.hh:
@@ -138,13 +140,13 @@ fluxbox_CPPFLAGS = \
138 -I$(fbtk_incdir) \ 140 -I$(fbtk_incdir) \
139 -I$(nls_incdir) 141 -I$(nls_incdir)
140 142
141fluxbox_LDFLAGS = \ 143fluxbox_LDADD = \
144 $(LDADD) \
142 $(FONTCONFIG_LIBS) \ 145 $(FONTCONFIG_LIBS) \
143 $(FREETYPE2_LIBS) \ 146 $(FREETYPE2_LIBS) \
144 $(FRIBIDI_LIBS) \ 147 $(FRIBIDI_LIBS) \
145 $(IMLIB2_LIBS) \ 148 $(IMLIB2_LIBS) \
146 $(RANDR_LIBS) \ 149 $(RANDR_LIBS) \
147 $(X11_LIBS) \
148 $(XEXT_LIBS) \ 150 $(XEXT_LIBS) \
149 $(XFT_LIBS) \ 151 $(XFT_LIBS) \
150 $(XINERAMA_LIBS) \ 152 $(XINERAMA_LIBS) \
@@ -152,7 +154,8 @@ fluxbox_LDFLAGS = \
152 $(XRENDER_LIBS) \ 154 $(XRENDER_LIBS) \
153 $(X_EXTRA_LIBS) \ 155 $(X_EXTRA_LIBS) \
154 $(X_LIBS) \ 156 $(X_LIBS) \
155 $(X_PRE_LIBS) 157 $(X_PRE_LIBS) \
158 $(X11_LIBS)
156 159
157fluxbox_SOURCES = \ 160fluxbox_SOURCES = \
158 src/AlphaMenu.cc \ 161 src/AlphaMenu.cc \
@@ -272,4 +275,3 @@ fluxbox_SOURCES = \
272 ${SLIT_SOURCE} \ 275 ${SLIT_SOURCE} \
273 ${TOOLBAR_SOURCE} 276 ${TOOLBAR_SOURCE}
274 277
275LDADD = libFbTk.a src/defaults.$(OBJEXT)
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)