include the right header and cast to avoid warnings

[chaz/openbox] / util / Makefile.am

diff --git a/util/Makefile.am b/util/Makefile.am
index 50a0aebf6f440c59ad18076f1db79da336154ed5..118c56fc8a76a1e9d4f6013c081f9449a982a463 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,18 +1,25 @@
-# util/Makefile.am for Openbox
+# util/Makefile.am for Blackbox - an X11 Window manager
 
-CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ \
-@ORDEREDPSEUDO@ @CLOBBER@
+CPPFLAGS= @CPPFLAGS@ @DEBUG@
 
+SUBDIRS =                      epist
 bin_SCRIPTS =          bsetbg
-bin_PROGRAMS =         bsetroot
+bin_PROGRAMS =         bsetroot xftlsfonts
 
 bsetroot_SOURCES =     bsetroot.cc
-bsetroot_LDADD =       ../src/BaseDisplay.o ../src/LinkedList.o ../src/Timer.o ../src/Image.o ../src/i18n.o
+bsetroot_LDADD =       ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o
+
+xftlsfonts_SOURCES = xftlsfonts.cc
 
 MAINTAINERCLEANFILES = Makefile.in
 
 distclean-local:
-       rm -f *\~
+       rm -f *\~ .\#*
+
+# local dependencies
 
-bsetroot.o: bsetroot.cc ../config.h bsetroot.h ../src/BaseDisplay.h \
- ../src/LinkedList.h ../src/Timer.h ../src/Image.h
+bsetroot.o: bsetroot.cc ../config.h ../src/i18n.hh \
+ ../src/../nls/blackbox-nls.hh ../src/GCCache.hh ../src/BaseDisplay.hh \
+ ../src/Timer.hh ../src/Color.hh ../src/Texture.hh ../src/Util.hh \
+ bsetroot.hh ../src/Image.hh
+xftlsfonts.o: xftlsfonts.cc