summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Glidic <sardemff7+git@sardemff7.net>2017-05-04 13:29:11 +0200
committerQuentin Glidic <sardemff7+git@sardemff7.net>2017-05-04 13:40:12 +0200
commit4fccb3efdcc0d74879e5eb38ce1fb428b7745184 (patch)
tree8a822319387c26194f743b411b01331fa4c5b97a
parentcc714f8f91f9c36192f19fb13e70205771ee1caf (diff)
theme-parser: Drop lexer/ in #includes
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
-rw-r--r--Makefile.am3
-rw-r--r--lexer/theme-lexer.l2
-rw-r--r--lexer/theme-parser.y2
-rw-r--r--source/theme.c2
4 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 38b6b80f..9afbfcc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,6 +118,7 @@ rofi_CFLAGS=\
$(cairo_CFLAGS)\
-DMANPAGE_PATH="\"$(mandir)/\""\
-I$(top_srcdir)/include/\
+ -I$(top_srcdir)/lexer/\
-I$(top_srcdir)/config/\
-I$(top_builddir)/\
-Werror=missing-prototypes\
@@ -267,6 +268,7 @@ textbox_test_CFLAGS=\
-DPLUGIN_PATH=\"${libdir}/rofi\"\
-DTHEME_DIR=\"$(themedir)\"\
-I$(top_srcdir)/include/\
+ -I$(top_srcdir)/lexer/\
-I$(top_srcdir)/config/\
-I$(top_builddir)/
@@ -412,6 +414,7 @@ helper_test_CFLAGS=\
-DPLUGIN_PATH=\"${libdir}/rofi\"\
-DTHEME_DIR=\"$(themedir)\"\
-I$(top_srcdir)/include/\
+ -I$(top_srcdir)/lexer/\
-I$(top_srcdir)/config/\
-I$(top_builddir)/
diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l
index ebf0f28a..8d7e5718 100644
--- a/lexer/theme-lexer.l
+++ b/lexer/theme-lexer.l
@@ -39,7 +39,7 @@
#include "rofi.h"
#include "theme.h"
-#include "lexer/theme-parser.h"
+#include "theme-parser.h"
#define LOG_DOMAIN "Parser"
int last_state = 0;
diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y
index e628dcb0..99f47ccc 100644
--- a/lexer/theme-parser.y
+++ b/lexer/theme-parser.y
@@ -70,7 +70,7 @@ typedef struct YYLTYPE {
#include <stdlib.h>
#include <glib.h>
-#include "lexer/theme-parser.h"
+#include "theme-parser.h"
ThemeWidget *rofi_theme = NULL;
void yyerror(YYLTYPE *yylloc, const char *what, const char* s);
int yylex (YYSTYPE *, YYLTYPE *);
diff --git a/source/theme.c b/source/theme.c
index a3e623bb..2cf1683b 100644
--- a/source/theme.c
+++ b/source/theme.c
@@ -32,7 +32,7 @@
#include <errno.h>
#include <string.h>
#include "theme.h"
-#include "lexer/theme-parser.h"
+#include "theme-parser.h"
#include "helper.h"
#include "settings.h"
#include "widgets/textbox.h"