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

diff --git a/util/Makefile.am b/util/Makefile.am
index 676e53ae..7bcc85d8 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,25 +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/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
 
 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
-xftlsfonts.o: xftlsfonts.cc