X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2FMakefile.am;h=7bcc85d8b46cba594c22b1faf95249c37ff24235;hb=5c752e66cfc2d58a7c94b70e88dfc95daa680d49;hp=6fdafeda970b171d3f84df9016cd114be9eb8447;hpb=3eb75618dc090ea9c71670ecdae75c9bc6321a4a;p=chaz%2Fopenbox

diff --git a/util/Makefile.am b/util/Makefile.am
index 6fdafeda..7bcc85d8 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,18 +1,21 @@
-# util/Makefile.am for Openbox
-
-CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ \
-@ORDEREDPSEUDO@ @CLOBBER@
+CPPFLAGS= @CPPFLAGS@
 
+#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 ../src/Geometry.o
+bsetroot_LDADD =	../src/basedisplay.o ../otk/color.o ../otk/gccache.o \
+			../otk/texture.o ../src/timer.o ../otk/image.o \
+			../otk/imagecontrol.o ../src/util.o ../src/screeninfo.o
+
+xftlsfonts_SOURCES = xftlsfonts.cc
+
+INCLUDES= -I../src -I../otk
 
 MAINTAINERCLEANFILES =	Makefile.in
 
 distclean-local:
-	rm -f *\~
+	rm -f *\~ .\#*
 
-bsetroot.o: bsetroot.cc ../config.h bsetroot.h ../src/BaseDisplay.h \
- ../src/LinkedList.h ../src/Timer.h ../src/Image.h ../src/Geometry.h
+# local dependencies