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

diff --git a/obtheme/lexer.l b/obtheme/lexer.l
index 0806e10b04a3af7854c27d84d9ce664ed4999920..067e5753b603ca4f53ffc04306f3dfd3286f3bc2 100644 (file)
--- a/obtheme/lexer.l
+++ b/obtheme/lexer.l
@@ -4,11 +4,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#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 dcafd84225b7993a4a37d705351af3ce6b2bb1a2..bcb82999ebe9294335fce4840eae06448c1eedb5 100644 (file)
--- a/obtheme/obtheme.c
+++ b/obtheme/obtheme.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <glib.h>
 #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 59bf310f4ba5b4e5d84aa9278dbab7b46d31be87..8cc8c71ebcdfdbf4d1ca3695153104aa5502738e 100644 (file)
--- a/obtheme/obtheme.h
+++ b/obtheme/obtheme.h
@@ -2,8 +2,8 @@
 #define __THEME_PARSE_H__
 
 #include <glib.h>
-#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 e4e07dc28bc0dce0dfa3c05b66e95a01c4218139..d46a83a3c08dc3437109c0d972238c2dadfc41c7 100644 (file)
--- a/obtheme/parser.y
+++ b/obtheme/parser.y
@@ -10,11 +10,11 @@
 #include <sys/stat.h>
 #include <limits.h>
 #include <unistd.h>
-#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;