StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: remove unneeded preprocessor include flags 

Better to avoid these unexpected include paths.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2017-07-29 22:43:08 +03:00
parent 1b6fa0298a
commit d44ba481d7
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -25,8 +25,6 @@ AM_CPPFLAGS = \
-DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \ -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
-DXLOCALEDIR='"$(XLOCALEDIR)"' \ -DXLOCALEDIR='"$(XLOCALEDIR)"' \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/xkbcomp \
-I$(top_builddir)/src/xkbcomp \
-include $(top_builddir)/src/config.h -include $(top_builddir)/src/config.h
AM_CFLAGS = $(BASE_CFLAGS) AM_CFLAGS = $(BASE_CFLAGS)
@ -115,7 +113,7 @@ xkbcommon_x11include_HEADERS = \
lib_LTLIBRARIES += libxkbcommon-x11.la lib_LTLIBRARIES += libxkbcommon-x11.la
libxkbcommon_x11_la_CFLAGS = $(AM_CFLAGS) $(XCB_XKB_CFLAGS) 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) libxkbcommon_x11_la_LIBADD = libxkbcommon.la $(XCB_XKB_LIBS)
if HAVE_VERSION_SCRIPT if HAVE_VERSION_SCRIPT
libxkbcommon_x11_la_LDFLAGS = -Wl,--version-script=${srcdir}/xkbcommon-x11.map libxkbcommon_x11_la_LDFLAGS = -Wl,--version-script=${srcdir}/xkbcommon-x11.map

4
bench/rules.c
View File

@ -24,8 +24,8 @@
#include <time.h> #include <time.h>
#include "../test/test.h" #include "../test/test.h"
#include "xkbcomp-priv.h" #include "xkbcomp/xkbcomp-priv.h"
#include "rules.h" #include "xkbcomp/rules.h"
#include "bench.h" #include "bench.h"
#define BENCHMARK_ITERATIONS 20000 #define BENCHMARK_ITERATIONS 20000

4
test/rmlvo-to-kccgst.c
View File

@ -24,8 +24,8 @@
#include <unistd.h> #include <unistd.h>
#include "test.h" #include "test.h"
#include "xkbcomp-priv.h" #include "xkbcomp/xkbcomp-priv.h"
#include "rules.h" #include "xkbcomp/rules.h"
int int
main(int argc, char *argv[]) main(int argc, char *argv[])

4
test/rules-file.c
View File

@ -22,8 +22,8 @@
*/ */
#include "test.h" #include "test.h"
#include "xkbcomp-priv.h" #include "xkbcomp/xkbcomp-priv.h"
#include "rules.h" #include "xkbcomp/rules.h"
struct test_data { struct test_data {
/* Rules file */ /* Rules file */