changed to reflect toolkit change

diff --git a/util/Makefile.am b/util/Makefile.am
index 19a852303979a1fec67dcd529f415c3d5913f23c..a7a9f5bb8f5eb7e3b4f6bca491fe67b643331ede 100644 (file)
--- a/util/Makefile.am
+++ b/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
\ No newline at end of file
+# local dependencies

diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 213d0f4809fc4800534612c4180bd3da93a73c0a..e578cfa0580d5d02948170481a608cc930706e65 100644 (file)
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -43,9 +43,9 @@ extern "C" {
 #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)

diff --git a/util/bsetroot.hh b/util/bsetroot.hh
index 5495680491b1f8f58d0d19971cd1b2d3296d3bef..912aa81b9bd02819c1c679a5b63281d84dedf11b 100644 (file)
--- a/util/bsetroot.hh
+++ b/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>
 

diff --git a/util/epist/Makefile.am b/util/epist/Makefile.am
index 3588cb304667854504dc5b73d615e5102566e9da..9bbcad1202dfa31c54d0b8c2f2ca5f531b2c365b 100644 (file)
--- a/util/epist/Makefile.am
+++ b/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