projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swrast: Fix eglMakeCurrent(dpy, NULL, NULL, ctx) (v2)
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
Makefile.am
diff --git
a/src/mesa/drivers/dri/Makefile.am
b/src/mesa/drivers/dri/Makefile.am
index 1c6dd08a85d680d9ebb69913604e6540d7af1e48..3876d7c41924b76a677a8158b2cbf10bdfd67315 100644
(file)
--- a/
src/mesa/drivers/dri/Makefile.am
+++ b/
src/mesa/drivers/dri/Makefile.am
@@
-6,13
+6,6
@@
MEGADRIVERS_DEPS =
SUBDIRS+=common
SUBDIRS+=common
-# On Android, we need to explicitly link to libglapi.so.
-if HAVE_ANDROID
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-endif
-
if HAVE_I915_DRI
SUBDIRS += i915
MEGADRIVERS_DEPS += i915/libi915_dri.la
if HAVE_I915_DRI
SUBDIRS += i915
MEGADRIVERS_DEPS += i915/libi915_dri.la
@@
-59,20
+52,28
@@
driinclude_HEADERS = \
nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
mesa_dri_drivers_la_SOURCES =
mesa_dri_drivers_la_LDFLAGS = \
nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
mesa_dri_drivers_la_SOURCES =
mesa_dri_drivers_la_LDFLAGS = \
- -module -avoid-version -shared -shrext .so \
- $(BSYMBOLIC) \
- $(GC_SECTIONS) \
- $()
+ -shared \
+ -shrext .so \
+ -module \
+ -no-undefined \
+ -avoid-version \
+ $(LD_BUILD_ID) \
+ $(BSYMBOLIC) \
+ $(GC_SECTIONS) \
+ $(LD_NO_UNDEFINED)
+
mesa_dri_drivers_la_LIBADD = \
../../libmesa.la \
common/libmegadriver_stub.la \
common/libdricommon.la \
mesa_dri_drivers_la_LIBADD = \
../../libmesa.la \
common/libmegadriver_stub.la \
common/libdricommon.la \
-
common
/libxmlconfig.la \
- $(
SHARED_GLAPI_LIB)
\
+
$(top_builddir)/src/util
/libxmlconfig.la \
+ $(
top_builddir)/src/mapi/shared-glapi/libglapi.la
\
$(MEGADRIVERS_DEPS) \
$(DRI_LIB_DEPS) \
$()
$(MEGADRIVERS_DEPS) \
$(DRI_LIB_DEPS) \
$()
+EXTRA_DIST = meson.build
+
if NEED_MEGADRIVER
dri_LTLIBRARIES = mesa_dri_drivers.la
if NEED_MEGADRIVER
dri_LTLIBRARIES = mesa_dri_drivers.la