make epist compile with the new code base
This commit is contained in:
parent
54c96668d9
commit
eb19a6b69e
9 changed files with 38 additions and 49 deletions
|
@ -1,6 +1,6 @@
|
|||
# util/Makefile.am for Blackbox - an X11 Window manager
|
||||
|
||||
CPPFLAGS= @CPPFLAGS@ @DEBUG@
|
||||
CXXFLAGS= @CXXFLAGS@
|
||||
|
||||
SUBDIRS = epist
|
||||
bin_SCRIPTS = bsetbg
|
||||
|
|
|
@ -4,19 +4,19 @@ DEFAULT_RC=$(pkgdatadir)/epistrc
|
|||
|
||||
CLEANFILES = epist.1 epistrc.5
|
||||
|
||||
CPPFLAGS= @CPPFLAGS@ @DEBUG@ -DDEFAULTRC=\"$(DEFAULT_RC)\"
|
||||
CXXFLAGS= @CXXFLAGS@ -DDEFAULTRC=\"$(DEFAULT_RC)\"
|
||||
|
||||
#EXTRA_PROGRAMS = epist
|
||||
bin_PROGRAMS = epist
|
||||
|
||||
man_MANS = epist.1 epistrc.5
|
||||
|
||||
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/i18n.o ../../src/Timer.o \
|
||||
../../src/GCCache.o ../../src/Color.o
|
||||
# ../../src/Texture.o \
|
||||
# ../../src/Image.o ../../src/ImageControl.o
|
||||
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
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
|
@ -39,28 +39,24 @@ uninstall-am:
|
|||
rm -f $(DESTDIR)$(pkgdatadir)/epistrc
|
||||
|
||||
# local dependencies
|
||||
|
||||
actions.o: actions.cc actions.hh
|
||||
epist.o: epist.cc actions.hh epist.hh window.hh ../../src/Util.hh \
|
||||
keytree.hh screen.hh ../../src/BaseDisplay.hh ../../src/Timer.hh \
|
||||
parser.hh ../../src/XAtom.hh
|
||||
keytree.o: keytree.cc keytree.hh actions.hh screen.hh window.hh \
|
||||
../../src/Util.hh
|
||||
main.o: main.cc epist.hh actions.hh window.hh ../../src/Util.hh \
|
||||
keytree.hh screen.hh ../../src/BaseDisplay.hh ../../src/Timer.hh \
|
||||
../../src/i18n.hh ../../nls/blackbox-nls.hh
|
||||
parser.o: parser.cc parser.hh actions.hh keytree.hh screen.hh window.hh \
|
||||
../../src/Util.hh
|
||||
screen.o: screen.cc ../../src/BaseDisplay.hh ../../src/Timer.hh \
|
||||
../../src/Util.hh ../../src/XAtom.hh screen.hh window.hh epist.hh \
|
||||
actions.hh keytree.hh
|
||||
window.o: window.cc epist.hh actions.hh window.hh ../../src/Util.hh \
|
||||
keytree.hh screen.hh ../../src/BaseDisplay.hh ../../src/Timer.hh \
|
||||
../../src/XAtom.hh
|
||||
config.o: config.cc config.hh ../../src/Util.hh \
|
||||
keytree.hh screen.hh ../../src/BaseDisplay.hh ../../src/Timer.hh \
|
||||
../../src/XAtom.hh
|
||||
yacc_parser.cc: epist.y
|
||||
bison -d epist.y -o yacc_parser.cc
|
||||
lex.yy.c: epist.l
|
||||
lex epist.l
|
||||
config.o: config.cc config.hh
|
||||
epist.o: epist.cc actions.hh epist.hh window.hh ../../src/util.hh \
|
||||
keytree.hh ../../src/timer.hh screen.hh config.hh \
|
||||
../../src/basedisplay.hh parser.hh ../../src/xatom.hh
|
||||
keytree.o: keytree.cc keytree.hh ../../src/timer.hh actions.hh \
|
||||
screen.hh window.hh ../../src/util.hh config.hh epist.hh \
|
||||
../../src/basedisplay.hh
|
||||
main.o: main.cc ../../version.h epist.hh actions.hh window.hh \
|
||||
../../src/util.hh keytree.hh ../../src/timer.hh screen.hh config.hh \
|
||||
../../src/basedisplay.hh
|
||||
parser.o: parser.cc parser.hh actions.hh keytree.hh ../../src/timer.hh \
|
||||
screen.hh window.hh ../../src/util.hh config.hh
|
||||
screen.o: screen.cc ../../src/basedisplay.hh ../../src/timer.hh \
|
||||
../../src/util.hh ../../src/xatom.hh screen.hh window.hh config.hh \
|
||||
epist.hh actions.hh keytree.hh
|
||||
window.o: window.cc epist.hh actions.hh window.hh ../../src/util.hh \
|
||||
keytree.hh ../../src/timer.hh screen.hh config.hh \
|
||||
../../src/basedisplay.hh ../../src/xatom.hh
|
||||
yacc_parser.o: yacc_parser.cc parser.hh actions.hh keytree.hh \
|
||||
../../src/timer.hh screen.hh window.hh ../../src/util.hh config.hh
|
||||
|
|
|
@ -65,7 +65,7 @@ using std::string;
|
|||
#include "screen.hh"
|
||||
#include "window.hh"
|
||||
#include "parser.hh"
|
||||
#include "../../src/XAtom.hh"
|
||||
#include "../../src/xatom.hh"
|
||||
|
||||
|
||||
epist::epist(char **argv, char *dpy_name, char *rc_file)
|
||||
|
|
|
@ -35,7 +35,7 @@ extern "C" {
|
|||
#include "keytree.hh"
|
||||
#include "config.hh"
|
||||
|
||||
#include "../../src/BaseDisplay.hh"
|
||||
#include "../../src/basedisplay.hh"
|
||||
|
||||
class XAtom;
|
||||
class screen;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#define _keytree_hh
|
||||
|
||||
#include <list>
|
||||
#include "../../src/Timer.hh"
|
||||
#include "../../src/timer.hh"
|
||||
#include "actions.hh"
|
||||
#include "screen.hh"
|
||||
|
||||
|
|
|
@ -48,15 +48,10 @@ using std::string;
|
|||
|
||||
#include "../../version.h"
|
||||
#include "epist.hh"
|
||||
#include "../../src/i18n.hh"
|
||||
|
||||
I18n i18n;
|
||||
|
||||
static void usage();
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
i18n.openCatalog("openbox.cat");
|
||||
|
||||
// parse the command line
|
||||
char *display_name = 0;
|
||||
char *rc_file = 0;
|
||||
|
@ -65,15 +60,13 @@ int main(int argc, char **argv) {
|
|||
const string argvi(argv[i]);
|
||||
if (argvi == "-display") {
|
||||
if (++i >= argc) {
|
||||
fprintf(stderr, i18n(mainSet, mainDISPLAYRequiresArg,
|
||||
"error: '-display' requires an argument\n"));
|
||||
fprintf(stderr, "error: '-display' requires an argument\n");
|
||||
exit(1);
|
||||
}
|
||||
display_name = argv[i];
|
||||
} else if (argvi == "-rc") {
|
||||
if (++i >= argc) {
|
||||
fprintf(stderr, i18n(mainSet, mainRCRequiresArg,
|
||||
"error: '-rc' requires an argument\n"));
|
||||
fprintf(stderr, "error: '-rc' requires an argument\n");
|
||||
exit(1);
|
||||
}
|
||||
rc_file = argv[i];
|
||||
|
|
|
@ -57,8 +57,8 @@ using std::hex;
|
|||
using std::dec;
|
||||
using std::string;
|
||||
|
||||
#include "../../src/BaseDisplay.hh"
|
||||
#include "../../src/XAtom.hh"
|
||||
#include "../../src/basedisplay.hh"
|
||||
#include "../../src/xatom.hh"
|
||||
#include "screen.hh"
|
||||
#include "epist.hh"
|
||||
#include "config.hh"
|
||||
|
|
|
@ -34,7 +34,7 @@ using std::dec;
|
|||
#include "epist.hh"
|
||||
#include "screen.hh"
|
||||
#include "window.hh"
|
||||
#include "../../src/XAtom.hh"
|
||||
#include "../../src/xatom.hh"
|
||||
|
||||
// defined by black/openbox
|
||||
const unsigned long XWindow::PropBlackboxAttributesElements;
|
||||
|
|
|
@ -30,7 +30,7 @@ extern "C" {
|
|||
#include <list>
|
||||
#include <string>
|
||||
|
||||
#include "../../src/Util.hh"
|
||||
#include "../../src/util.hh"
|
||||
|
||||
class epist;
|
||||
class screen;
|
||||
|
|
Loading…
Reference in a new issue