summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/common/Makefile.am
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/mesa/drivers/dri/common/Makefile.am
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/mesa/drivers/dri/common/Makefile.am')
-rw-r--r--src/mesa/drivers/dri/common/Makefile.am13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
index c85c470a2fb..f26cc069381 100644
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ b/src/mesa/drivers/dri/common/Makefile.am
@@ -19,11 +19,9 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-SUBDIRS = xmlpool
-
include Makefile.sources
-EXTRA_DIST = drirc xmlpool.h SConscript
+EXTRA_DIST = SConscript
AM_CFLAGS = \
-I$(top_srcdir)/include \
@@ -32,22 +30,15 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
+ -I$(top_builddir)/src/util/ \
$(LIBDRM_CFLAGS) \
$(DEFINES) \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
$(VISIBILITY_CFLAGS)
noinst_LTLIBRARIES = \
libdricommon.la \
- libxmlconfig.la \
libmegadriver_stub.la
libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
-libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
-libxmlconfig_la_CFLAGS = $(AM_CFLAGS) $(EXPAT_CFLAGS)
-libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
-
libmegadriver_stub_la_SOURCES = $(megadriver_stub_FILES)
-
-sysconf_DATA = drirc