summaryrefslogtreecommitdiffstats
path: root/src/loader
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2017-06-30 11:57:06 +0200
committerNicolai Hähnle <[email protected]>2017-07-31 15:38:41 +0200
commit601093f95ddf6b49a79baa91dc51d4f163dfc8de (patch)
tree79cc7388e4d4de45d226852368ffcc813098b577 /src/loader
parent1e40d2c8820e2045fbfed387a93a486c8b1c94fd (diff)
xmlconfig: move into src/util
v2: attempt to fix Android build (Emil) v3: add missing include path Reviewed-by: Marek Olšák <[email protected]> (v1)
Diffstat (limited to 'src/loader')
-rw-r--r--src/loader/Makefile.am4
-rw-r--r--src/loader/loader.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 340b335ca9b..8b197f2995c 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -39,14 +39,14 @@ libloader_la_LIBADD =
if HAVE_DRICOMMON
libloader_la_CPPFLAGS += \
- -I$(top_builddir)/src/mesa/drivers/dri/common/ \
+ -I$(top_builddir)/src/util/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mapi/ \
-DUSE_DRICONF
libloader_la_LIBADD += \
- $(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la
+ $(top_builddir)/src/util/libxmlconfig.la
endif
diff --git a/src/loader/loader.c b/src/loader/loader.c
index c3fc961be59..182ba90a0da 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -46,8 +46,8 @@
#ifdef HAVE_LIBDRM
#include <xf86drm.h>
#ifdef USE_DRICONF
-#include "xmlconfig.h"
-#include "xmlpool.h"
+#include "util/xmlconfig.h"
+#include "util/xmlpool.h"
#endif
#endif