Commit d44ba481d7a22310f5345cc90f7ba66928006f40
2017-07-29T22:43:08
build: remove unneeded preprocessor include flags Better to avoid these unexpected include paths. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/Makefile.am b/Makefile.am
index a9d84d4..be5abc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,6 @@ AM_CPPFLAGS = \
-DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
-DXLOCALEDIR='"$(XLOCALEDIR)"' \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/src/xkbcomp \
- -I$(top_builddir)/src/xkbcomp \
-include $(top_builddir)/src/config.h
AM_CFLAGS = $(BASE_CFLAGS)
@@ -115,7 +113,7 @@ xkbcommon_x11include_HEADERS = \
lib_LTLIBRARIES += libxkbcommon-x11.la
libxkbcommon_x11_la_CFLAGS = $(AM_CFLAGS) $(XCB_XKB_CFLAGS)
-libxkbcommon_x11_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/x11
+libxkbcommon_x11_la_CPPFLAGS = $(AM_CPPFLAGS)
libxkbcommon_x11_la_LIBADD = libxkbcommon.la $(XCB_XKB_LIBS)
if HAVE_VERSION_SCRIPT
libxkbcommon_x11_la_LDFLAGS = -Wl,--version-script=${srcdir}/xkbcommon-x11.map
diff --git a/bench/rules.c b/bench/rules.c
index 0dda7e3..c5d7dc8 100644
--- a/bench/rules.c
+++ b/bench/rules.c
@@ -24,8 +24,8 @@
#include <time.h>
#include "../test/test.h"
-#include "xkbcomp-priv.h"
-#include "rules.h"
+#include "xkbcomp/xkbcomp-priv.h"
+#include "xkbcomp/rules.h"
#include "bench.h"
#define BENCHMARK_ITERATIONS 20000
diff --git a/test/rmlvo-to-kccgst.c b/test/rmlvo-to-kccgst.c
index 5d15933..f3c8076 100644
--- a/test/rmlvo-to-kccgst.c
+++ b/test/rmlvo-to-kccgst.c
@@ -24,8 +24,8 @@
#include <unistd.h>
#include "test.h"
-#include "xkbcomp-priv.h"
-#include "rules.h"
+#include "xkbcomp/xkbcomp-priv.h"
+#include "xkbcomp/rules.h"
int
main(int argc, char *argv[])
diff --git a/test/rules-file.c b/test/rules-file.c
index e91d546..b32009e 100644
--- a/test/rules-file.c
+++ b/test/rules-file.c
@@ -22,8 +22,8 @@
*/
#include "test.h"
-#include "xkbcomp-priv.h"
-#include "rules.h"
+#include "xkbcomp/xkbcomp-priv.h"
+#include "xkbcomp/rules.h"
struct test_data {
/* Rules file */