1 files changed, 9 insertions, 9 deletions

diff --git a/util/Makefile.am b/util/Makefile.am
index 296bafb..4b8665a 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,17 +1,17 @@
 # util/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
-
-CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ \
-@ORDEREDPSEUDO@
-
-bin_SCRIPTS = bsetbg
+SUBDIRS = fbrun
+INCLUDES=-I../src/FbTk/
+bin_SCRIPTS = bsetbg fluxbox-generate_menu
 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
+bsetroot_LDADD =        ../src/BaseDisplay.o ../src/i18n.o ../src/FbAtoms.o \
+        ../src/StringUtil.o ../src/FbTk/libFbTk.a
+
 MAINTAINERCLEANFILES =  Makefile.in
-EXTRA_DIST=bsetbg
+EXTRA_DIST=bsetbg fluxbox-generate_menu
 
 distclean-local:
         rm -f *\~
 
-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 bsetroot.hh ../src/BaseDisplay.hh ../src/FbAtoms.hh
+