From d6255d95b226f765b694391e056f5acc2e5c172b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 21 May 2010 15:37:39 -0400 Subject: [PATCH] fix header includes in obtheme some should point to other dirs, and some need to point to the renamed parser.y's new output parser.h --- obtheme/lexer.l | 8 ++++---- obtheme/obtheme.c | 2 +- obtheme/obtheme.h | 4 ++-- obtheme/parser.y | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/obtheme/lexer.l b/obtheme/lexer.l index 0806e10b..067e5753 100644 --- a/obtheme/lexer.l +++ b/obtheme/lexer.l @@ -4,11 +4,11 @@ #include #include #include -#include "frame.h" -#include "misc.h" -#include "render.h" +#include "openbox/frame.h" +#include "openbox/misc.h" +#include "obrender/render.h" #include "obtheme.h" -#include "obtheme.tab.h" +#include "parser.h" int yylex(YYSTYPE *yylval, struct parser_control *pc); diff --git a/obtheme/obtheme.c b/obtheme/obtheme.c index dcafd842..bcb82999 100644 --- a/obtheme/obtheme.c +++ b/obtheme/obtheme.c @@ -3,7 +3,7 @@ #include #include #include "obtheme.h" -#include "geom.h" +#include "openbox/geom.h" static double variable_lookup(struct variable *in) { diff --git a/obtheme/obtheme.h b/obtheme/obtheme.h index 59bf310f..8cc8c71e 100644 --- a/obtheme/obtheme.h +++ b/obtheme/obtheme.h @@ -2,8 +2,8 @@ #define __THEME_PARSE_H__ #include -#include "frame.h" -#include "misc.h" +#include "openbox/frame.h" +#include "openbox/misc.h" #undef YY_DECL #define YY_DECL int obthemelex(YYSTYPE *yylval, struct parser_control *pc) diff --git a/obtheme/parser.y b/obtheme/parser.y index e4e07dc2..d46a83a3 100644 --- a/obtheme/parser.y +++ b/obtheme/parser.y @@ -10,11 +10,11 @@ #include #include #include -#include "frame.h" -#include "misc.h" -#include "render.h" +#include "openbox/frame.h" +#include "openbox/misc.h" +#include "obrender/render.h" #include "obtheme.h" -#include "obtheme.tab.h" +#include "parser.h" YY_DECL; -- 2.34.1