1 files changed, 33 insertions, 19 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8e5f514..af39ccf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 # Makefile.am for fluxbox
-# Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
+# Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
 #
 # src/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
-# Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
+# Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -23,33 +23,47 @@
 # DEALINGS IN THE SOFTWARE.
 
 
+SUBDIRS= FbTk
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
-DEFAULT_TITLEBAR=$(pkgdatadir)/titlebar
 DEFAULT_KEYSFILE=$(pkgdatadir)/keys
 DEFAULT_INITFILE=
 
-CPPFLAGS= -Wall @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ \
-@DEBUG@ @NEWWMSPEC@ @NLS@ @TIMEDCACHE@ @KDE@ @GNOME@ \
+AM_CPPFLAGS= -Wall @CPPFLAGS@ \
 -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--DDEFAULTTITLEBAR=\"$(DEFAULT_TITLEBAR)\"\
 -DDEFAULTKEYSFILE=\"$(DEFAULT_KEYSFILE)\"\
--DDEFAULT_INITFILE=\"$(pkgdatadir)/init\"
+-DDEFAULT_INITFILE=\"$(pkgdatadir)/init\"\
+-IFbTk
 
 bin_PROGRAMS= fluxbox
 
-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 LinkedList.cc LinkedList.hh \
-                                                Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh\
-                                                Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh \
-                                                Window.cc Window.hh Windowmenu.cc Windowmenu.hh \
-                                                Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh \
-                                                fluxbox.cc fluxbox.hh bsd-snprintf.c bsd-snprintf.h \
-                                                i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh\
-                                                IconBar.cc IconBar.hh Theme.hh Theme.cc misc.hh misc.cc \
-                                                Rotated.hh                              
-MAINTAINERCLEANFILES= Makefile.in
 
+if NEWWMSPEC
+newwmspec_SOURCE= Ewmh.hh Ewmh.cc
+endif
+if GNOME
+gnome_SOURCE= Gnome.hh Gnome.cc
+endif
+
+fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc BaseDisplay.cc BaseDisplay.hh \
+        BoolMenuItem.hh \
+        DirHelper.hh DirHelper.cc DrawUtil.cc DrawUtil.hh ${newwmspec_SOURCE} \
+        FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc FbWinFrameTheme.hh FbWinFrameTheme.cc \
+        fluxbox.cc fluxbox.hh ${gnome_SOURCE} \
+        IconBar.cc IconBar.hh \
+        i18n.cc i18n.hh \
+        Keys.cc Keys.hh main.cc \
+        Netizen.cc Netizen.hh nl_types_cygnus.h \
+        Resource.hh Resource.cc \
+        Screen.cc Screen.hh \
+        Slit.cc Slit.hh StringUtil.cc StringUtil.hh \
+        Tab.hh Tab.cc Theme.hh Theme.cc \
+        Toolbar.cc Toolbar.hh \
+        ToolbarTheme.hh ToolbarTheme.cc \
+        WinButton.hh WinButton.cc Window.cc Window.hh \
+        Workspace.cc Workspace.hh \
+        XrmDatabaseHelper.hh FbCommands.hh FbCommands.cc LayerMenu.hh \
+        IntResMenuItem.hh IntResMenuItem.cc FbMenu.hh
+LDADD=FbTk/libFbTk.a