X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2FMakefile.am;h=7bcc85d8b46cba594c22b1faf95249c37ff24235;hb=bbb403aab82519384d86f9fd7071a8ace72fca3a;hp=7da2187bbbe3ea3d48231370c35efdc87c484622;hpb=f04d2f0fc3c8cec77b94fa7fe50438a45f06b420;p=chaz%2Fopenbox

diff --git a/util/Makefile.am b/util/Makefile.am
index 7da2187b..7bcc85d8 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,13 +1,17 @@
-# util/Makefile.am for Blackbox - an X11 Window manager
+CPPFLAGS= @CPPFLAGS@
 
-CPPFLAGS= @CPPFLAGS@ @DEBUG@
-
-SUBDIRS = 			epist
+#SUBDIRS = 		epist
 bin_SCRIPTS = 		bsetbg
-bin_PROGRAMS =		bsetroot
+bin_PROGRAMS =		bsetroot xftlsfonts
 
 bsetroot_SOURCES =	bsetroot.cc
-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
+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
 
@@ -15,8 +19,3 @@ distclean-local:
 	rm -f *\~ .\#*
 
 # local dependencies
-
-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