X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fmain%2FMakefile.am;h=d21d8a9eb5aeba30aeee2a4fe1a3258051ee9925;hb=c5be9c126d6ca9380cd381a5eb22554e4bb71a64;hp=ad1bbdb753263714bbde4031ae511c8cc02fb398;hpb=31b044506e14c482162596641218bdae520a466d;p=mesa.git

diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index ad1bbdb7532..d21d8a9eb5a 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -19,62 +19,31 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-GLAPI_LIB = ../mapi/glapi/libglapi.a
-
-if HAVE_XF86VIDMODE
-EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
-endif
+include Makefile.sources
 
 AM_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gbm/main \
 	$(DEFINES) \
+	$(VISIBILITY_CFLAGS) \
 	$(EGL_CFLAGS) \
 	-D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
-	-D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \
+	-D_EGL_DRIVER_SEARCH_DIR=\"$(libdir)/egl\" \
 	-D_EGL_OS_UNIX=1
 
 lib_LTLIBRARIES = libEGL.la
 
 libEGL_la_SOURCES = \
-	eglapi.c \
-	eglarray.c \
-	eglconfig.c \
-	eglcontext.c \
-	eglcurrent.c \
-	egldisplay.c \
-	egldriver.c \
-	eglfallbacks.c \
-	eglglobals.c \
-	eglimage.c \
-	egllog.c \
-	eglmisc.c \
-	eglmode.c \
-	eglscreen.c \
-	eglstring.c \
-	eglsurface.c \
-	eglsync.c \
-	eglcompiler.h \
-	eglconfig.h \
-	eglcontext.h \
-	eglcurrent.h \
-	egldefines.h \
-	egldisplay.h \
-	egldriver.h \
-	eglglobals.h \
-	eglimage.h \
-	egllog.h \
-	eglmisc.h \
-	eglmode.h \
-	eglmutex.h \
-	eglscreen.h \
-	eglstring.h \
-	eglsurface.h \
-	eglsync.h
+	${LIBEGL_C_FILES}
 
 libEGL_la_LIBADD = \
 	$(EGL_LIB_DEPS)
-libEGL_la_LDFLAGS = -version-number 1:0
+libEGL_la_LDFLAGS = \
+	-no-undefined \
+	-version-number 1:0 \
+	$(BSYMBOLIC) \
+	$(GC_SECTIONS) \
+	$(LD_NO_UNDEFINED)
 
 if HAVE_EGL_PLATFORM_X11
 AM_CFLAGS += -DHAVE_X11_PLATFORM
@@ -93,7 +62,6 @@ endif
 if HAVE_EGL_PLATFORM_DRM
 AM_CFLAGS += -DHAVE_DRM_PLATFORM
 libEGL_la_LIBADD += ../../gbm/libgbm.la
-libEGL_la_LIBADD += ../../gbm/libgbm.la
 endif
 
 if HAVE_EGL_PLATFORM_FBDEV
@@ -104,25 +72,14 @@ if HAVE_EGL_PLATFORM_NULL
 AM_CFLAGS += -DHAVE_NULL_PLATFORM
 endif
 
-if HAVE_EGL_DRIVER_GLX
-AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
-libEGL_la_LIBADD += ../drivers/glx/libegl_glx.la
-libEGL_la_LIBADD += $(X11_LIBS) $(DLOPEN_LIBS)
-endif
-
 if HAVE_EGL_DRIVER_DRI2
 AM_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
 AM_CFLAGS += -DHAVE_XCB_DRI2
 libEGL_la_LIBADD += ../drivers/dri2/libegl_dri2.la
-libEGL_la_LIBADD += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIBS)
+libEGL_la_LIBADD += $(DLOPEN_LIBS) $(LIBDRM_LIBS)
 endif
 
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: libEGL.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-	ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1
-	ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so
+include $(top_srcdir)/install-lib-links.mk
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -135,5 +92,11 @@ egldir = $(includedir)/EGL
 egl_HEADERS = \
 	$(top_srcdir)/include/EGL/eglext.h \
 	$(top_srcdir)/include/EGL/egl.h \
+	$(top_srcdir)/include/EGL/eglextchromium.h \
 	$(top_srcdir)/include/EGL/eglmesaext.h \
 	$(top_srcdir)/include/EGL/eglplatform.h
+
+EXTRA_DIST = \
+	egl.def \
+	README.txt \
+	SConscript