diff options
| author | Marius Nita <marius@cs.pdx.edu> | 2002-11-01 03:32:22 +0000 |
|---|---|---|
| committer | Marius Nita <marius@cs.pdx.edu> | 2002-11-01 03:32:22 +0000 |
| commit | 90c5fdc2d162678e8b257762b0d90745450af51d (patch) | |
| tree | df12119acfbaa617b42903177ba9bbf62773faa4 /util | |
| parent | 110a1eeed9b5d0deb127a02364cf6c6fe29a9de8 (diff) | |
changed to reflect toolkit change
Diffstat (limited to 'util')
| -rw-r--r-- | util/Makefile.am | 10 | ||||
| -rw-r--r-- | util/bsetroot.cc | 6 | ||||
| -rw-r--r-- | util/bsetroot.hh | 4 | ||||
| -rw-r--r-- | util/epist/Makefile.am | 3 |
4 files changed, 12 insertions, 11 deletions
diff --git a/util/Makefile.am b/util/Makefile.am index 19a85230..a7a9f5bb 100644 --- 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 213d0f48..e578cfa0 100644 --- 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 54956804..912aa81b 100644 --- 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 3588cb30..9bbcad12 100644 --- 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 |