X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fglx%2FMakefile.am;h=a66957d609bf3c498fd2cdfac03e9ad4dc55df60;hb=a999798daad7181110922a7e756eb1d8dfe55c4e;hp=a11bd3ff011f09ff91b1ec569ae23046338fe47f;hpb=ca760181b4420696c7e86aa2951d7203522ad1e8;p=mesa.git

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index a11bd3ff011..a66957d609b 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -19,105 +19,177 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
-SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
 
-GLAPI_LIB = ../mapi/glapi/libglapi.a
+SUBDIRS =
 
-if HAVE_XF86VIDMODE
-EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
-endif
+EXTRA_DIST = SConscript meson.build
 
 AM_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/include/GL/internal \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/loader \
+	-I$(top_builddir)/src/mapi \
 	-I$(top_srcdir)/src/mapi \
+	-I$(top_builddir)/src/mapi/glapi \
 	-I$(top_srcdir)/src/mapi/glapi \
-	$(SHARED_GLAPI_CFLAGS) \
-	$(EXTRA_DEFINES_XF86VIDMODE) \
+	$(VISIBILITY_CFLAGS) \
 	-D_REENTRANT \
-	-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
 	$(DEFINES) \
 	$(LIBDRM_CFLAGS) \
 	$(DRI2PROTO_CFLAGS) \
 	$(GLPROTO_CFLAGS) \
 	$(X11_INCLUDES)
 
-if HAVE_MANGLED_GL
-MANGLED_GL_LIB = libMangledGL.la
-else
-NORMAL_GL_LIB = libGL.la
+lib_LTLIBRARIES = lib@GL_LIB@.la
+
+noinst_LTLIBRARIES = libglx.la
+
+libglx_la_SOURCES = \
+	clientattrib.c \
+	clientinfo.c \
+	compsize.c \
+	create_context.c \
+	eval.c \
+	glxclient.h \
+	glxcmds.c \
+	glxconfig.c \
+	glxconfig.h \
+	glxcurrent.c \
+	glx_error.c \
+	glx_error.h \
+	glxext.c \
+	glxextensions.c \
+	glxextensions.h \
+	glxhash.c \
+	glxhash.h \
+	glx_pbuffer.c \
+	glx_query.c \
+	indirect.c \
+	indirect_glx.c \
+	indirect_init.c \
+	indirect_init.h \
+	indirect_size.c \
+	indirect_texture_compression.c \
+	indirect_transpose_matrix.c \
+	indirect_vertex_array.c \
+	indirect_vertex_array.h \
+	indirect_vertex_array_priv.h \
+	indirect_vertex_program.c \
+	indirect_window_pos.c \
+	packrender.h \
+	packsingle.h \
+	pixel.c \
+	pixelstore.c \
+	query_renderer.c \
+	render2.c \
+	renderpix.c \
+	single2.c \
+	singlepix.c \
+	vertarr.c
+
+libglx_la_LIBADD = \
+	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libmesautil.la \
+	$(top_builddir)/src/util/libxmlconfig.la
+
+if HAVE_DRISW
+libglx_la_SOURCES += \
+	drisw_glx.c \
+	drisw_priv.h
+endif
+
+if HAVE_DRICOMMON
+libglx_la_SOURCES += \
+	dri_common.c \
+	dri_common.h \
+	dri_common_query_renderer.c \
+	dri_common_interop.c \
+	xfont.c
+endif
+
+if HAVE_DRI2
+libglx_la_SOURCES += \
+	dri2.c \
+	dri2_glx.c \
+	dri2.h \
+	dri2_priv.h \
+	dri_glx.c \
+	dri_sarea.h \
+	XF86dri.c \
+	xf86dri.h \
+	xf86dristr.h
+endif
+
+if HAVE_DRI3
+libglx_la_SOURCES += \
+	dri3_glx.c \
+	dri3_priv.h
+
+libglx_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la
 endif
 
-lib_LTLIBRARIES = \
-	$(NORMAL_GL_LIB) \
-	$(MANGLED_GL_LIB)
-
-GL_FILES = \
-	  clientattrib.c \
-	  clientinfo.c \
-	  compsize.c \
-	  create_context.c \
-	  eval.c \
-	  glxconfig.c \
-	  glxcmds.c \
-	  glxcurrent.c \
-	  glx_error.c \
-	  glxext.c \
-	  glxextensions.c \
-	  indirect_glx.c \
-	  indirect.c \
-	  indirect_init.c \
-	  indirect_size.c \
-	  indirect_window_pos.c \
-	  indirect_texture_compression.c \
-	  indirect_transpose_matrix.c \
-	  indirect_vertex_array.c \
-	  indirect_vertex_program.c \
-	  pixel.c \
-	  pixelstore.c \
-	  render2.c \
-	  renderpix.c \
-	  single2.c \
-	  singlepix.c \
-	  vertarr.c \
-	  xfont.c \
-	  glx_pbuffer.c \
-	  glx_query.c \
-	  drisw_glx.c \
-	  dri_common.c \
-	  dri_glx.c \
-	  XF86dri.c \
-	  glxhash.c \
-	  dri2_glx.c \
-	  dri2.c \
-	  applegl_glx.c
+if HAVE_APPLEDRI
+libglx_la_SOURCES += \
+	applegl_glx.c
 
+SUBDIRS += apple
+libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
+endif
+
+if HAVE_WINDOWSDRI
+libglx_la_SOURCES += \
+	  driwindows_glx.c
+
+SUBDIRS += windows
+libglx_la_LIBADD += \
+	  $(builddir)/windows/libwindowsdri.la \
+	  $(builddir)/windows/libwindowsglx.la
+endif
+
+if USE_LIBGLVND
+AM_CFLAGS += \
+	-DGL_LIB_NAME=\"lib@GL_LIB@.so.0\" \
+	$(GLVND_CFLAGS)
+
+libglx_la_SOURCES += \
+	g_glxglvnddispatchfuncs.c \
+	g_glxglvnddispatchindices.h \
+	glxglvnd.c \
+	glxglvnd.h \
+	glxglvnddispatchfuncs.h
+
+GL_LIB_VERSION=0
+else
+AM_CFLAGS += \
+	-DGL_LIB_NAME=\"lib@GL_LIB@.so.1\"
+GL_LIB_VERSION=1:2
+endif
+
+# Push the libdrm furhter up, as due to libtool bug we might end up relinking
+# against the system one.
 GL_LIBS = \
-	$(SHARED_GLAPI_LIBS) \
-	$(GLAPI_LIB) \
+	$(LIBDRM_LIBS) \
+	libglx.la \
+	$(top_builddir)/src/mapi/glapi/libglapi.la \
+	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
 	$(GL_LIB_DEPS)
 
 GL_LDFLAGS = \
-	-version-number 1:2
-
-libGL_la_SOURCES = $(GL_FILES)
-libMangledGL_la_SOURCES = $(GL_FILES)
-libGL_la_LIBADD = $(GL_LIBS)
-libMangledGL_la_LIBADD = $(GL_LIBS)
-libGL_la_LDFLAGS = $(GL_LDFLAGS)
-libMangledGL_la_LDFLAGS = $(GL_LDFLAGS)
-
-# 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.
-if !HAVE_MANGLED_GL
-all-local: $(NORMAL_GL_LIB) $(MANGLED_GL_LIB)
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-	ln -f .libs/libGL.so.1.2.0 $(top_builddir)/$(LIB_DIR)/libGL.so.1
-	ln -sf libGL.so.1 $(top_builddir)/$(LIB_DIR)/libGL.so
+	-no-undefined \
+	-version-number $(GL_LIB_VERSION) \
+	$(BSYMBOLIC) \
+	$(GC_SECTIONS) \
+	$(LD_NO_UNDEFINED)
+
+lib@GL_LIB@_la_SOURCES =
+lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
+lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
+
+if HAVE_WINDOWSDRI
+lib@GL_LIB@_la_LDFLAGS += -lgdi32 -lopengl32 -Wl,--disable-stdcall-fixup
 endif
 
-$(GLAPI_LIB):
-	@$(MAKE) -C $(TOP)/src/mapi/glapi
+SUBDIRS += . tests
+
+include $(top_srcdir)/install-lib-links.mk