aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-26 16:03:36 (GMT)
committerfluxgen <fluxgen>2002-11-26 16:03:36 (GMT)
commitcf287a3fde0c8d5739412eea7a20febcace60885 (patch)
tree891053dbb05d42590a692bd828bdbebd4c505b6b
parentac4420cdc50b7d7410781bc1bbbd1e89e18f256d (diff)
downloadfluxbox-cf287a3fde0c8d5739412eea7a20febcace60885.zip
fluxbox-cf287a3fde0c8d5739412eea7a20febcace60885.tar.bz2
moved FbTk files into FbTk dir
-rw-r--r--src/Makefile.am39
1 files changed, 17 insertions, 22 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d3382c..ce9fc9a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,7 @@
23# DEALINGS IN THE SOFTWARE. 23# DEALINGS IN THE SOFTWARE.
24 24
25 25
26SUBDIRS= FbTk
26DEFAULT_MENU=$(pkgdatadir)/menu 27DEFAULT_MENU=$(pkgdatadir)/menu
27DEFAULT_STYLE=$(pkgdatadir)/styles/Clean 28DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
28DEFAULT_KEYSFILE=$(pkgdatadir)/keys 29DEFAULT_KEYSFILE=$(pkgdatadir)/keys
@@ -33,38 +34,32 @@ AM_CPPFLAGS= -Wall @CPPFLAGS@ \
33-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ 34-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
34-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ 35-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
35-DDEFAULTKEYSFILE=\"$(DEFAULT_KEYSFILE)\"\ 36-DDEFAULTKEYSFILE=\"$(DEFAULT_KEYSFILE)\"\
36-DDEFAULT_INITFILE=\"$(pkgdatadir)/init\" 37-DDEFAULT_INITFILE=\"$(pkgdatadir)/init\"\
38-IFbTk
37 39
38bin_PROGRAMS= fluxbox 40bin_PROGRAMS= fluxbox
39 41
40if XFT 42
41xft_SOURCE= XftFontImp.hh XftFontImp.cc
42endif
43if NEWWMSPEC 43if NEWWMSPEC
44newwmspec_SOURCE= Ewmh.hh Ewmh.cc 44newwmspec_SOURCE= Ewmh.hh Ewmh.cc
45endif 45endif
46if GNOME 46if GNOME
47gnome_SOURCE= Gnome.hh Gnome.cc 47gnome_SOURCE= Gnome.hh Gnome.cc
48endif 48endif
49if MULTIBYTE
50xmb_SOURCE= XmbFontImp.hh XmbFontImp.cc
51endif
52 49
53fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \ 50fluxbox_SOURCES = AtomHandler.hh BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \
54 Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh \ 51 Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh \
55 Iconmenu.cc Iconmenu.hh Image.cc Image.hh \ 52 DrawUtil.cc DrawUtil.hh ${newwmspec_SOURCE} \
56 Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh\ 53 FbAtoms.hh FbAtoms.cc fluxbox.cc fluxbox.hh ${gnome_SOURCE} \
57 Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh \ 54 IconBar.cc IconBar.hh Iconmenu.cc Iconmenu.hh Image.cc Image.hh i18n.cc i18n.hh \
55 Keys.cc Keys.hh main.cc \
56 Netizen.cc Netizen.hh nl_types_cygnus.h \
57 Rootmenu.cc Rootmenu.hh Resource.hh Resource.cc \
58 Screen.cc Screen.hh \
59 Slit.cc Slit.hh StringUtil.cc StringUtil.hh Subject.cc Subject.hh \
60 Tab.hh Tab.cc Theme.hh Theme.cc Timer.cc Timer.hh Toolbar.cc Toolbar.hh Observer.cc Observer.hh\
58 Window.cc Window.hh Windowmenu.cc Windowmenu.hh \ 61 Window.cc Window.hh Windowmenu.cc Windowmenu.hh \
59 Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh \ 62 Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh \
60 fluxbox.cc fluxbox.hh \ 63 XrmDatabaseHelper.hh
61 i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh \ 64
62 IconBar.cc IconBar.hh Theme.hh Theme.cc \ 65LDADD=FbTk/.libs/libFbTk.a
63 StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh nl_types_cygnus.h \
64 XrmDatabaseHelper.hh NotCopyable.hh Resource.hh Resource.cc \
65 Font.hh Font.cc FontImp.hh XFontImp.hh XFontImp.cc \
66 FbAtoms.hh FbAtoms.cc Color.hh Color.cc Texture.hh Texture.cc \
67 SignalHandler.hh SignalHandler.cc \
68 EventHandler.hh AtomHandler.hh \
69 Observer.hh Observer.cc Subject.hh Subject.cc \
70 ${xft_SOURCE} ${gnome_SOURCE} ${newwmspec_SOURCE} ${xmb_SOURCE}