1 files changed, 81 insertions, 23 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8e5f514..939756c 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,91 @@
 # 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@ \
--DLOCALEPATH=\"$(pkgdatadir)/nls\" \
--DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
--DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--DDEFAULTTITLEBAR=\"$(DEFAULT_TITLEBAR)\"\
--DDEFAULTKEYSFILE=\"$(DEFAULT_KEYSFILE)\"\
--DDEFAULT_INITFILE=\"$(pkgdatadir)/init\"
+AM_CPPFLAGS= -Wall @CPPFLAGS@ -IFbTk
 
 bin_PROGRAMS= fluxbox
+BUILT_SOURCES = defaults.hh
+defaults.hh: Makefile
+        echo '// This file is generated from makefile. Do not edit!' > defaults.hh
+        echo '#define DEFAULTMENU "$(DEFAULT_MENU)"' >> defaults.hh
+        echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh
+        echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh
+        echo '#define DEFAULT_INITFILE "$(pkgdatadir)/init"' >> defaults.hh
+        echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh
 
-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
+# some extra deps for I18n and fluxbox
 
+I18n.$(OBJEXT): defaults.hh
+fluxbox.$(OBJEXT): defaults.hh
+
+if NEWWMSPEC
+newwmspec_SOURCE= Ewmh.hh Ewmh.cc
+endif
+if GNOME
+gnome_SOURCE= Gnome.hh Gnome.cc
+endif
+if REMEMBER_SRC
+REMEMBER_SOURCE= Remember.hh Remember.cc
+# For now we only want regexp if we have remember
+if REGEXP_SRC
+REGEXP_SOURCE = RegExp.hh RegExp.cc ClientPattern.hh ClientPattern.cc
+endif
+endif
+if TOOLBAR_SRC
+TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
+        ToolbarTheme.hh ToolbarTheme.cc ToolbarItem.hh ToolbarItem.cc \
+        ClockTool.hh ClockTool.cc \
+        WorkspaceNameTool.hh WorkspaceNameTool.cc WorkspaceNameTheme.hh \
+        IconbarTool.hh IconbarTool.cc IconbarTheme.hh IconbarTheme.cc \
+        ToolTheme.hh ToolTheme.cc \
+        IconButton.hh IconButton.cc \
+        SystemTray.hh SystemTray.cc \
+        GenericTool.hh GenericTool.cc \
+        ButtonTool.hh ButtonTool.cc ButtonTheme.hh ButtonTheme.cc \
+        ToolFactory.hh ToolFactory.cc
+endif
+
+fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
+        BoolMenuItem.hh \
+        FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
+        FbWinFrameTheme.hh FbWinFrameTheme.cc \
+        fluxbox.cc fluxbox.hh \
+        I18n.cc I18n.hh \
+        Keys.cc Keys.hh main.cc \
+        Netizen.cc Netizen.hh \
+        RootTheme.hh RootTheme.cc \
+        FbRootWindow.hh FbRootWindow.cc \
+        Screen.cc Screen.hh \
+        Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc \
+        WinButton.hh WinButton.cc \
+        WinButtonTheme.hh WinButtonTheme.cc \
+        Window.cc Window.hh \
+        Workspace.cc Workspace.hh \
+        FbCommands.hh FbCommands.cc LayerMenu.hh \
+        IntResMenuItem.hh IntResMenuItem.cc FbMenu.hh FbMenu.cc \
+        WinClient.hh WinClient.cc \
+        Strut.hh \
+        Xinerama.hh \
+        IconMenuItem.hh \
+        Xutil.hh Xutil.cc \
+        CurrentWindowCmd.hh CurrentWindowCmd.cc \
+        WorkspaceCmd.hh WorkspaceCmd.cc \
+        CommandParser.hh CommandParser.cc \
+        FbCommandFactory.hh FbCommandFactory.cc \
+        Shape.hh Shape.cc \
+        MenuTheme.hh MenuTheme.cc \
+        Container.hh Container.cc \
+        TextTheme.hh TextTheme.cc \
+        BorderTheme.hh BorderTheme.cc \
+        CommandDialog.hh CommandDialog.cc SendToMenu.hh SendToMenu.cc \
+        ${newwmspec_SOURCE} ${gnome_SOURCE} \
+        ${REMEMBER_SOURCE} ${REGEXP_SOURCE} ${TOOLBAR_SOURCE}
+
+
+LDADD=FbTk/libFbTk.a