X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2FMakefile.am;h=3ea1b30d7cfbde33ad70672ee229c44b46262cde;hb=dd0f2f3695c03cf11340f20e5e3dea0e64cc9a98;hp=f66c4bd59ad96219b5227f708bd1f534d0f78a75;hpb=4680d237c5ae2d1ce6446ff2ec2f0a91f8286554;p=mesa.git

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index f66c4bd59ad..3ea1b30d7cf 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -21,12 +21,12 @@
 
 if HAVE_SHARED_GLAPI
 SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
-SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
 
-SUBDIRS=. tests
+SUBDIRS =
 
-GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la
+EXTRA_DIST = SConscript
 
 if HAVE_XF86VIDMODE
 EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
@@ -35,6 +35,7 @@ endif
 AM_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/include/GL/internal \
+	-I$(top_srcdir)/src/loader \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mapi/glapi \
 	-I$(top_builddir)/src/mapi \
@@ -55,64 +56,108 @@ lib_LTLIBRARIES = lib@GL_LIB@.la
 noinst_LTLIBRARIES = libglx.la
 
 libglx_la_SOURCES = \
-	  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 \
-	  query_renderer.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 \
-	  dri2_query_renderer.c \
-	  applegl_glx.c
+	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
+
+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 \
+	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
+endif
+
+if HAVE_APPLEDRI
+libglx_la_SOURCES += \
+	applegl_glx.c
+
+SUBDIRS += apple
+libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
+endif
 
 GL_LIBS = \
 	libglx.la \
-	$(SHARED_GLAPI_LIBS) \
-	$(GLAPI_LIB) \
+	$(top_builddir)/src/mapi/glapi/libglapi.la \
+	$(SHARED_GLAPI_LIB) \
 	$(GL_LIB_DEPS)
 
 GL_LDFLAGS = \
-	-Wl,-Bsymbolic \
-	-version-number 1:2 -no-undefined
+	-no-undefined \
+	-version-number 1:2 \
+	$(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)
 
-# 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: lib@GL_LIB@.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-	ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1
-	ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so
+SUBDIRS += . tests
+
+include $(top_srcdir)/install-lib-links.mk