M util/Makefile.am → util/Makefile.am

@@ -7,15 +7,17 @@ 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
 
 xftlsfonts_SOURCES = xftlsfonts.cc
+
+INCLUDES= -I../src -I../otk
 
 MAINTAINERCLEANFILES =	Makefile.in
 
 distclean-local:
 	rm -f *\~ .\#*
 
-# local dependencies+# local dependencies

M util/bsetroot.cc → util/bsetroot.cc

@@ -43,9 +43,9 @@ # include <ctype.h>
 #endif // HAVE_CTYPE_H
 }
 
-#include "../src/gccache.hh"
-#include "../src/texture.hh"
-#include "../src/util.hh"
+#include "gccache.hh"
+#include "texture.hh"
+#include "util.hh"
 #include "bsetroot.hh"
 
 bsetroot::bsetroot(int argc, char **argv, char *dpy_name)

M util/bsetroot.hh → util/bsetroot.hh

@@ -24,8 +24,8 @@ 
 #ifndef   __bsetroot2_hh
 #define   __bsetroot2_hh
 
-#include "../src/basedisplay.hh"
-#include "../src/image.hh"
+#include "basedisplay.hh"
+#include "image.hh"
 
 #include <string>
 

M util/epist/Makefile.am → util/epist/Makefile.am

@@ -15,8 +15,7 @@ epist_SOURCES =		epist.cc window.cc screen.cc main.cc actions.cc \
 			yacc_parser.cc parser.cc keytree.cc lex.yy.c config.cc
 
 epist_LDADD =		../../src/xatom.o ../../src/basedisplay.o \
-			../../src/util.o ../../src/timer.o \
-			../../src/gccache.o ../../src/color.o
+			../../src/util.o ../../src/timer.o
 
 MAINTAINERCLEANFILES =	Makefile.in