aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-10-15 09:48:16 (GMT)
committerfluxgen <fluxgen>2002-10-15 09:48:16 (GMT)
commit6918872ba23e9a9cdf293051f192c7b874005432 (patch)
tree6890fd2b4ab5a051c9fcb5440bde9715b79a2a55
parent8c96955e6b4dae4a2227fb579f73bbdf9c8528a3 (diff)
downloadfluxbox_paul-6918872ba23e9a9cdf293051f192c7b874005432.zip
fluxbox_paul-6918872ba23e9a9cdf293051f192c7b874005432.tar.bz2
conditional XFT files
-rw-r--r--src/Makefile.am20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 160d0d9..2938796 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
1# Makefile.am for fluxbox 1# Makefile.am for fluxbox
2# Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) 2# Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3# 3#
4# src/Makefile.am for Blackbox 0.61.x - an X11 Window manager 4# src/Makefile.am for Blackbox 0.61.x - an X11 Window manager
5# Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5# Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@@ -28,7 +28,7 @@ DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
28DEFAULT_KEYSFILE=$(pkgdatadir)/keys 28DEFAULT_KEYSFILE=$(pkgdatadir)/keys
29DEFAULT_INITFILE= 29DEFAULT_INITFILE=
30 30
31CPPFLAGS= -Wall @CPPFLAGS@ \ 31AM_CPPFLAGS= -Wall @CPPFLAGS@ \
32-DLOCALEPATH=\"$(pkgdatadir)/nls\" \ 32-DLOCALEPATH=\"$(pkgdatadir)/nls\" \
33-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ 33-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
34-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ 34-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
@@ -37,7 +37,11 @@ CPPFLAGS= -Wall @CPPFLAGS@ \
37 37
38bin_PROGRAMS= fluxbox 38bin_PROGRAMS= fluxbox
39 39
40fluxbox_SOURCES= BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \ 40if XFT
41xft_SOURCE= XftFontImp.hh XftFontImp.cc
42endif
43
44fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \
41 Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh \ 45 Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh \
42 Icon.cc Icon.hh Image.cc Image.hh \ 46 Icon.cc Icon.hh Image.cc Image.hh \
43 Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh\ 47 Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh\
@@ -45,14 +49,12 @@ fluxbox_SOURCES= BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \
45 Window.cc Window.hh Windowmenu.cc Windowmenu.hh \ 49 Window.cc Window.hh Windowmenu.cc Windowmenu.hh \
46 Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh \ 50 Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh \
47 fluxbox.cc fluxbox.hh \ 51 fluxbox.cc fluxbox.hh \
48 i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh\ 52 i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh \
49 IconBar.cc IconBar.hh Theme.hh Theme.cc \ 53 IconBar.cc IconBar.hh Theme.hh Theme.cc \
50 StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh nl_types_cygnus.h \ 54 StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh nl_types_cygnus.h \
51 XrmDatabaseHelper.hh NotCopyable.hh Resource.hh Resource.cc \ 55 XrmDatabaseHelper.hh NotCopyable.hh Resource.hh Resource.cc \
52 Font.hh Font.cc FontImp.hh XFontImp.hh XFontImp.cc XmbFontImp.hh XmbFontImp.cc XftFontImp.hh XftFontImp.cc\ 56 Font.hh Font.cc FontImp.hh XFontImp.hh XFontImp.cc XmbFontImp.hh XmbFontImp.cc \
53 FbAtoms.hh FbAtoms.cc Color.hh Color.cc Texture.hh Texture.cc \ 57 FbAtoms.hh FbAtoms.cc Color.hh Color.cc Texture.hh Texture.cc \
54 SignalHandler.hh SignalHandler.cc \ 58 SignalHandler.hh SignalHandler.cc \
55 EventHandler.hh AtomHandler.hh Gnome.hh Gnome.cc Ewmh.hh Ewmh.cc\ 59 EventHandler.hh AtomHandler.hh Gnome.hh Gnome.cc Ewmh.hh Ewmh.cc \
56 Observer.hh Observer.cc Subject.hh Subject.cc 60 Observer.hh Observer.cc Subject.hh Subject.cc ${xft_SOURCE}
57MAINTAINERCLEANFILES= Makefile.in
58