changed to reflect toolkit change
This commit is contained in:
parent
110a1eeed9
commit
90c5fdc2d1
4 changed files with 12 additions and 11 deletions
|
@ -7,15 +7,17 @@ bin_SCRIPTS = bsetbg
|
||||||
bin_PROGRAMS = bsetroot xftlsfonts
|
bin_PROGRAMS = bsetroot xftlsfonts
|
||||||
|
|
||||||
bsetroot_SOURCES = bsetroot.cc
|
bsetroot_SOURCES = bsetroot.cc
|
||||||
bsetroot_LDADD = ../src/basedisplay.o ../src/color.o ../src/gccache.o \
|
bsetroot_LDADD = ../src/basedisplay.o ../otk/color.o ../otk/gccache.o \
|
||||||
../src/texture.o ../src/timer.o ../src/image.o \
|
../otk/texture.o ../src/timer.o ../otk/image.o \
|
||||||
../src/imagecontrol.o ../src/util.o
|
../otk/imagecontrol.o ../src/util.o
|
||||||
|
|
||||||
xftlsfonts_SOURCES = xftlsfonts.cc
|
xftlsfonts_SOURCES = xftlsfonts.cc
|
||||||
|
|
||||||
|
INCLUDES= -I../src -I../otk
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
distclean-local:
|
distclean-local:
|
||||||
rm -f *\~ .\#*
|
rm -f *\~ .\#*
|
||||||
|
|
||||||
# local dependencies
|
# local dependencies
|
||||||
|
|
|
@ -43,9 +43,9 @@ extern "C" {
|
||||||
#endif // HAVE_CTYPE_H
|
#endif // HAVE_CTYPE_H
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "../src/gccache.hh"
|
#include "gccache.hh"
|
||||||
#include "../src/texture.hh"
|
#include "texture.hh"
|
||||||
#include "../src/util.hh"
|
#include "util.hh"
|
||||||
#include "bsetroot.hh"
|
#include "bsetroot.hh"
|
||||||
|
|
||||||
bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
|
bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
#ifndef __bsetroot2_hh
|
#ifndef __bsetroot2_hh
|
||||||
#define __bsetroot2_hh
|
#define __bsetroot2_hh
|
||||||
|
|
||||||
#include "../src/basedisplay.hh"
|
#include "basedisplay.hh"
|
||||||
#include "../src/image.hh"
|
#include "image.hh"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
|
|
@ -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
|
yacc_parser.cc parser.cc keytree.cc lex.yy.c config.cc
|
||||||
|
|
||||||
epist_LDADD = ../../src/xatom.o ../../src/basedisplay.o \
|
epist_LDADD = ../../src/xatom.o ../../src/basedisplay.o \
|
||||||
../../src/util.o ../../src/timer.o \
|
../../src/util.o ../../src/timer.o
|
||||||
../../src/gccache.o ../../src/color.o
|
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue