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

diff --git a/util/Makefile.am b/util/Makefile.am
index b217dde3..7bcc85d8 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,21 +1,21 @@
-# util/Makefile.am for Blackbox - an X11 Window manager
+CPPFLAGS= @CPPFLAGS@
 
-CXXFLAGS= @CXXFLAGS@
-
-SUBDIRS = 		epist
+#SUBDIRS = 		epist
 bin_SCRIPTS = 		bsetbg
 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/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
 
 distclean-local:
 	rm -f *\~ .\#*
 
-# local dependencies
\ No newline at end of file
+# local dependencies