1 files changed, 35 insertions, 13 deletions

diff --git a/util/Makefile.am b/util/Makefile.am
index 296bafb..66376f4 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,17 +1,39 @@
-# util/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
+# util/Makefile.am for Fluxbox
+SUBDIRS=                fbrun
+INCLUDES=               -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
+bin_SCRIPTS=            fbsetbg fluxbox-generate_menu startfluxbox
+bin_PROGRAMS=           bsetroot
+bsetroot_SOURCES=       bsetroot.cc bsetroot.hh
+bsetroot_LDADD=         ../src/FbRootWindow.o ../src/I18n.o \
+                        ../src/FbAtoms.o ../src/FbTk/libFbTk.a
 
-CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ \
-@ORDEREDPSEUDO@
+MAINTAINERCLEANFILES=   Makefile.in
+EXTRA_DIST=             fbsetbg fluxbox-generate_menu.in \
+                                startfluxbox.in
 
-bin_SCRIPTS = bsetbg
-bin_PROGRAMS =          bsetroot
-bsetroot_SOURCES =      bsetroot.cc bsetroot.hh
-bsetroot_LDADD =        ../src/BaseDisplay.o ../src/LinkedList.o ../src/Timer.o ../src/Image.o ../src/i18n.o
-MAINTAINERCLEANFILES =  Makefile.in
-EXTRA_DIST=bsetbg
+all-local:      startfluxbox
 
-distclean-local:
-        rm -f *\~
+clean-local:
+                rm -f startfluxbox fluxbox-generate_menu
 
-bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \
- ../src/LinkedList.hh ../src/Timer.hh ../src/Image.hh
+bsetroot.o:     bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \
+                        $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
+
+startfluxbox:   startfluxbox.in
+                @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
+                            -e "s,@pkgbindir@,$(bindir),g" \
+                                $(srcdir)/startfluxbox.in > startfluxbox
+                -chmod 755 startfluxbox
+
+fluxbox-generate_menu: fluxbox-generate_menu.in
+                @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
+                                $(srcdir)/fluxbox-generate_menu.in \
+                                > fluxbox-generate_menu
+                -chmod 755 fluxbox-generate_menu
+
+../src/FbRootWindow.o:
+        cd ../src && ${MAKE} FbRootWindow.o
+../src/I18n.o:
+        cd ../src && ${MAKE} I18n.o
+../src/FbAtoms.o:
+        cd ../src && ${MAKE} FbAtoms.o