aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/loader/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-22 21:39:56 +0100
committermarha <marha@users.sourceforge.net>2015-02-22 21:39:56 +0100
commit462f18c7b25fe3e467f837647d07ab0a78aa8d2b (patch)
treefc8013c0a1bac05a1945846c1697e973f4c35013 /mesalib/src/loader/Makefile.am
parent36f711ee12b6dd5184198abed3aa551efb585587 (diff)
downloadvcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.gz
vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.bz2
vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.zip
Merged origin/release (checked in because wanted to merge new stuff)
Diffstat (limited to 'mesalib/src/loader/Makefile.am')
-rwxr-xr-xmesalib/src/loader/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/mesalib/src/loader/Makefile.am b/mesalib/src/loader/Makefile.am
index 16b9f8f70..36ddba82b 100755
--- a/mesalib/src/loader/Makefile.am
+++ b/mesalib/src/loader/Makefile.am
@@ -21,6 +21,8 @@
include Makefile.sources
+EXTRA_DIST = SConscript
+
noinst_LTLIBRARIES = libloader.la
libloader_la_CPPFLAGS = \
@@ -33,14 +35,14 @@ libloader_la_CPPFLAGS = \
libloader_la_SOURCES = $(LOADER_C_FILES)
libloader_la_LIBADD =
-if NEED_OPENGL_COMMON
if HAVE_DRICOMMON
libloader_la_CPPFLAGS += \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_builddir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mapi/ \
- -DUSE_DRICONF
+ -DUSE_DRICONF \
+ $(EXPAT_CFLAGS)
libloader_la_SOURCES += \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
@@ -49,7 +51,6 @@ libloader_la_LIBADD += \
-lm \
$(EXPAT_LIBS)
endif
-endif
if !HAVE_LIBDRM
libloader_la_CPPFLAGS += \