diff options
author | Sami Kerola <kerolasa@iki.fi> | 2013-02-13 21:33:09 (GMT) |
---|---|---|
committer | Sami Kerola <kerolasa@iki.fi> | 2013-05-26 09:38:10 (GMT) |
commit | 9e5eddfc3d42afc7455cdccc4907ea57a98aeb47 (patch) | |
tree | 4888f208bbc8d7751ddf0f3126d0672b873a5249 /util | |
parent | 22ddf8fd3650072c6243941f27617158e111b236 (diff) | |
download | fluxbox-9e5eddfc3d42afc7455cdccc4907ea57a98aeb47.zip fluxbox-9e5eddfc3d42afc7455cdccc4907ea57a98aeb47.tar.bz2 |
build-sys: use pkg-config to locate dependencies
This commit alters XRANDR (X Resize And Rotate) extension dependency,
which is expected to have at least version 1.4. Earlier old versions of
xrandr were supported, at least to some extent.
Diffstat (limited to 'util')
-rw-r--r-- | util/Makefile.am | 11 | ||||
-rw-r--r-- | util/fbrun/Makefile.am | 8 |
2 files changed, 19 insertions, 0 deletions
diff --git a/util/Makefile.am b/util/Makefile.am index 1123f68..63fe66a 100644 --- a/util/Makefile.am +++ b/util/Makefile.am | |||
@@ -6,10 +6,21 @@ bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote | |||
6 | fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh | 6 | fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh |
7 | fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \ | 7 | fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \ |
8 | ../src/FbTk/libFbTk.a | 8 | ../src/FbTk/libFbTk.a |
9 | fbsetroot_LDFLAGS = \ | ||
10 | $(FONTCONFIG_LIBS) \ | ||
11 | $(FRIBIDI_LIBS) \ | ||
12 | $(X11_LIBS) \ | ||
13 | $(XFT_LIBS) \ | ||
14 | $(XRENDER_LIBS) | ||
15 | |||
9 | fluxbox_update_configs_SOURCES= fluxbox-update_configs.cc | 16 | fluxbox_update_configs_SOURCES= fluxbox-update_configs.cc |
10 | fluxbox_update_configs_LDADD= ../src/defaults.o ../src/Resources.o \ | 17 | fluxbox_update_configs_LDADD= ../src/defaults.o ../src/Resources.o \ |
11 | ../src/FbTk/libFbTk.a | 18 | ../src/FbTk/libFbTk.a |
19 | fluxbox_update_configs_LDFLAGS = \ | ||
20 | $(FRIBIDI_LIBS) \ | ||
21 | $(X11_LIBS) | ||
12 | fluxbox_remote_SOURCES= fluxbox-remote.cc | 22 | fluxbox_remote_SOURCES= fluxbox-remote.cc |
23 | fluxbox_remote_LDFLAGS = $(X11_LIBS) | ||
13 | 24 | ||
14 | MAINTAINERCLEANFILES= Makefile.in | 25 | MAINTAINERCLEANFILES= Makefile.in |
15 | EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \ | 26 | EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \ |
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am index 57fa1f6..92f7c47 100644 --- a/util/fbrun/Makefile.am +++ b/util/fbrun/Makefile.am | |||
@@ -3,6 +3,14 @@ AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_build | |||
3 | bin_PROGRAMS= fbrun | 3 | bin_PROGRAMS= fbrun |
4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm | 4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm |
5 | fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a | 5 | fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a |
6 | fbrun_LDFLAGS = \ | ||
7 | $(FONTCONFIG_LIBS) \ | ||
8 | $(FRIBIDI_LIBS) \ | ||
9 | $(X11_LIBS) \ | ||
10 | $(XINERAMA_LIBS) \ | ||
11 | $(XFT_LIBS) \ | ||
12 | $(XPM_LIBS) \ | ||
13 | $(XRENDER_LIBS) | ||
6 | 14 | ||
7 | ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a: | 15 | ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a: |
8 | cd ${FLUXBOX_SRC_DIR}FbTk && make | 16 | cd ${FLUXBOX_SRC_DIR}FbTk && make |