From 6918872ba23e9a9cdf293051f192c7b874005432 Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Tue, 15 Oct 2002 09:48:16 +0000 Subject: conditional XFT files --- src/Makefile.am | 20 +++++++++++--------- 1 file 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 @@ # Makefile.am for fluxbox -# Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) +# Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org) # # src/Makefile.am for Blackbox 0.61.x - an X11 Window manager # Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) @@ -28,7 +28,7 @@ DEFAULT_STYLE=$(pkgdatadir)/styles/Clean DEFAULT_KEYSFILE=$(pkgdatadir)/keys DEFAULT_INITFILE= -CPPFLAGS= -Wall @CPPFLAGS@ \ +AM_CPPFLAGS= -Wall @CPPFLAGS@ \ -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ @@ -37,7 +37,11 @@ CPPFLAGS= -Wall @CPPFLAGS@ \ bin_PROGRAMS= fluxbox -fluxbox_SOURCES= BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \ +if XFT +xft_SOURCE= XftFontImp.hh XftFontImp.cc +endif + +fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \ Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh \ Icon.cc Icon.hh Image.cc Image.hh \ 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 \ Window.cc Window.hh Windowmenu.cc Windowmenu.hh \ Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh \ fluxbox.cc fluxbox.hh \ - i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh\ + i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh \ IconBar.cc IconBar.hh Theme.hh Theme.cc \ StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh nl_types_cygnus.h \ XrmDatabaseHelper.hh NotCopyable.hh Resource.hh Resource.cc \ - Font.hh Font.cc FontImp.hh XFontImp.hh XFontImp.cc XmbFontImp.hh XmbFontImp.cc XftFontImp.hh XftFontImp.cc\ + Font.hh Font.cc FontImp.hh XFontImp.hh XFontImp.cc XmbFontImp.hh XmbFontImp.cc \ FbAtoms.hh FbAtoms.cc Color.hh Color.cc Texture.hh Texture.cc \ SignalHandler.hh SignalHandler.cc \ - EventHandler.hh AtomHandler.hh Gnome.hh Gnome.cc Ewmh.hh Ewmh.cc\ - Observer.hh Observer.cc Subject.hh Subject.cc -MAINTAINERCLEANFILES= Makefile.in - + EventHandler.hh AtomHandler.hh Gnome.hh Gnome.cc Ewmh.hh Ewmh.cc \ + Observer.hh Observer.cc Subject.hh Subject.cc ${xft_SOURCE} -- cgit v0.11.2