nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make epist compile with the new code base

Browse source
This commit is contained in:
Dana Jansens 2002-11-01 02:27:17 +00:00
parent 54c96668d9
commit eb19a6b69e
9 changed files with 38 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
util/Makefile.am
View file

@ -1,8 +1,8 @@
# util/Makefile.am for Blackbox - an X11 Window manager # util/Makefile.am for Blackbox - an X11 Window manager
CPPFLAGS= @CPPFLAGS@ @DEBUG@ CXXFLAGS= @CXXFLAGS@
SUBDIRS = epist SUBDIRS = epist
bin_SCRIPTS = bsetbg bin_SCRIPTS = bsetbg
bin_PROGRAMS = bsetroot xftlsfonts bin_PROGRAMS = bsetroot xftlsfonts

58
util/epist/Makefile.am
View file

@ -4,19 +4,19 @@ DEFAULT_RC=$(pkgdatadir)/epistrc
CLEANFILES = epist.1 epistrc.5 CLEANFILES = epist.1 epistrc.5
CPPFLAGS= @CPPFLAGS@ @DEBUG@ -DDEFAULTRC=\"$(DEFAULT_RC)\" CXXFLAGS= @CXXFLAGS@ -DDEFAULTRC=\"$(DEFAULT_RC)\"
#EXTRA_PROGRAMS = epist #EXTRA_PROGRAMS = epist
bin_PROGRAMS = epist bin_PROGRAMS = epist
man_MANS = epist.1 epistrc.5 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_SOURCES = epist.cc window.cc screen.cc main.cc actions.cc \
epist_LDADD = ../../src/XAtom.o ../../src/BaseDisplay.o \ yacc_parser.cc parser.cc keytree.cc lex.yy.c config.cc
../../src/Util.o ../../src/i18n.o ../../src/Timer.o \
../../src/GCCache.o ../../src/Color.o epist_LDADD = ../../src/xatom.o ../../src/basedisplay.o \
# ../../src/Texture.o \ ../../src/util.o ../../src/timer.o \
# ../../src/Image.o ../../src/ImageControl.o ../../src/gccache.o ../../src/color.o
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
@ -39,28 +39,24 @@ uninstall-am:
rm -f $(DESTDIR)$(pkgdatadir)/epistrc rm -f $(DESTDIR)$(pkgdatadir)/epistrc
# local dependencies # local dependencies
actions.o: actions.cc actions.hh actions.o: actions.cc actions.hh
epist.o: epist.cc actions.hh epist.hh window.hh ../../src/Util.hh \ config.o: config.cc config.hh
keytree.hh screen.hh ../../src/BaseDisplay.hh ../../src/Timer.hh \ epist.o: epist.cc actions.hh epist.hh window.hh ../../src/util.hh \
parser.hh ../../src/XAtom.hh keytree.hh ../../src/timer.hh screen.hh config.hh \
keytree.o: keytree.cc keytree.hh actions.hh screen.hh window.hh \ ../../src/basedisplay.hh parser.hh ../../src/xatom.hh
../../src/Util.hh keytree.o: keytree.cc keytree.hh ../../src/timer.hh actions.hh \
main.o: main.cc epist.hh actions.hh window.hh ../../src/Util.hh \ screen.hh window.hh ../../src/util.hh config.hh epist.hh \
keytree.hh screen.hh ../../src/BaseDisplay.hh ../../src/Timer.hh \ ../../src/basedisplay.hh
../../src/i18n.hh ../../nls/blackbox-nls.hh main.o: main.cc ../../version.h epist.hh actions.hh window.hh \
parser.o: parser.cc parser.hh actions.hh keytree.hh screen.hh window.hh \ ../../src/util.hh keytree.hh ../../src/timer.hh screen.hh config.hh \
../../src/Util.hh ../../src/basedisplay.hh
screen.o: screen.cc ../../src/BaseDisplay.hh ../../src/Timer.hh \ parser.o: parser.cc parser.hh actions.hh keytree.hh ../../src/timer.hh \
../../src/Util.hh ../../src/XAtom.hh screen.hh window.hh epist.hh \ screen.hh window.hh ../../src/util.hh config.hh
actions.hh keytree.hh screen.o: screen.cc ../../src/basedisplay.hh ../../src/timer.hh \
window.o: window.cc epist.hh actions.hh window.hh ../../src/Util.hh \ ../../src/util.hh ../../src/xatom.hh screen.hh window.hh config.hh \
keytree.hh screen.hh ../../src/BaseDisplay.hh ../../src/Timer.hh \ epist.hh actions.hh keytree.hh
../../src/XAtom.hh window.o: window.cc epist.hh actions.hh window.hh ../../src/util.hh \
config.o: config.cc config.hh ../../src/Util.hh \ keytree.hh ../../src/timer.hh screen.hh config.hh \
keytree.hh screen.hh ../../src/BaseDisplay.hh ../../src/Timer.hh \ ../../src/basedisplay.hh ../../src/xatom.hh
../../src/XAtom.hh yacc_parser.o: yacc_parser.cc parser.hh actions.hh keytree.hh \
yacc_parser.cc: epist.y ../../src/timer.hh screen.hh window.hh ../../src/util.hh config.hh
bison -d epist.y -o yacc_parser.cc
lex.yy.c: epist.l
lex epist.l

2
util/epist/epist.cc
View file

@ -65,7 +65,7 @@ using std::string;
#include "screen.hh" #include "screen.hh"
#include "window.hh" #include "window.hh"
#include "parser.hh" #include "parser.hh"
#include "../../src/XAtom.hh" #include "../../src/xatom.hh"
epist::epist(char **argv, char *dpy_name, char *rc_file) epist::epist(char **argv, char *dpy_name, char *rc_file)

2
util/epist/epist.hh
View file

@ -35,7 +35,7 @@ extern "C" {
#include "keytree.hh" #include "keytree.hh"
#include "config.hh" #include "config.hh"
#include "../../src/BaseDisplay.hh" #include "../../src/basedisplay.hh"
class XAtom; class XAtom;
class screen; class screen;

2
util/epist/keytree.hh
View file

@ -24,7 +24,7 @@
#define _keytree_hh #define _keytree_hh
#include <list> #include <list>
#include "../../src/Timer.hh" #include "../../src/timer.hh"
#include "actions.hh" #include "actions.hh"
#include "screen.hh" #include "screen.hh"

11
util/epist/main.cc
View file

@ -48,15 +48,10 @@ using std::string;
#include "../../version.h" #include "../../version.h"
#include "epist.hh" #include "epist.hh"
#include "../../src/i18n.hh"
I18n i18n;
static void usage(); static void usage();
int main(int argc, char **argv) { int main(int argc, char **argv) {
i18n.openCatalog("openbox.cat");
// parse the command line // parse the command line
char *display_name = 0; char *display_name = 0;
char *rc_file = 0; char *rc_file = 0;
@ -65,15 +60,13 @@ int main(int argc, char **argv) {
const string argvi(argv[i]); const string argvi(argv[i]);
if (argvi == "-display") { if (argvi == "-display") {
if (++i >= argc) { if (++i >= argc) {
fprintf(stderr, i18n(mainSet, mainDISPLAYRequiresArg, fprintf(stderr, "error: '-display' requires an argument\n");
"error: '-display' requires an argument\n"));
exit(1); exit(1);
} }
display_name = argv[i]; display_name = argv[i];
} else if (argvi == "-rc") { } else if (argvi == "-rc") {
if (++i >= argc) { if (++i >= argc) {
fprintf(stderr, i18n(mainSet, mainRCRequiresArg, fprintf(stderr, "error: '-rc' requires an argument\n");
"error: '-rc' requires an argument\n"));
exit(1); exit(1);
} }
rc_file = argv[i]; rc_file = argv[i];

4
util/epist/screen.cc
View file

@ -57,8 +57,8 @@ using std::hex;
using std::dec; using std::dec;
using std::string; using std::string;
#include "../../src/BaseDisplay.hh" #include "../../src/basedisplay.hh"
#include "../../src/XAtom.hh" #include "../../src/xatom.hh"
#include "screen.hh" #include "screen.hh"
#include "epist.hh" #include "epist.hh"
#include "config.hh" #include "config.hh"

2
util/epist/window.cc
View file

@ -34,7 +34,7 @@ using std::dec;
#include "epist.hh" #include "epist.hh"
#include "screen.hh" #include "screen.hh"
#include "window.hh" #include "window.hh"
#include "../../src/XAtom.hh" #include "../../src/xatom.hh"
// defined by black/openbox // defined by black/openbox
const unsigned long XWindow::PropBlackboxAttributesElements; const unsigned long XWindow::PropBlackboxAttributesElements;

2
util/epist/window.hh
View file

@ -30,7 +30,7 @@ extern "C" {
#include <list> #include <list>
#include <string> #include <string>
#include "../../src/Util.hh" #include "../../src/util.hh"
class epist; class epist;
class screen; class screen;