drivers/x11: remove unneeded GLX_SHARED_GLAPI define

[mesa.git] / src / mesa / drivers / x11 / Makefile.am

diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index 726a9c66936c8f8b3119abfbab6df5bd4b2b1bf1..8c6b67d6a8d704a3bda33b25591fb7950c4bfcd5 100644 (file)
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -23,52 +23,58 @@
 # GLX extension.  All rendering is converted to Xlib calls.  No hardware
 # acceleration.
 
+EXTRA_DIST = SConscript
+
+if HAVE_SHARED_GLAPI
+SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+endif
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/mesa/main \
        $(X11_INCLUDES) \
-       $(API_DEFINES) \
        $(DEFINES)
 
-if HAVE_X11_DRIVER
 lib_LTLIBRARIES = lib@GL_LIB@.la
-endif
 
 lib@GL_LIB@_la_SOURCES = \
        glxapi.h \
        glxheader.h \
        xfonts.h \
        xmesaP.h \
-       xm_image.h \
        fakeglx.c \
        glxapi.c \
        xfonts.c \
        xm_api.c \
        xm_buffer.c \
        xm_dd.c \
+       xmesa.h \
+       xmesa_x.h \
        xm_line.c \
        xm_tri.c
 
+# Force usage of a C++ linker
+nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
+
 GL_MAJOR = 1
 GL_MINOR = 6
 GL_PATCH = 0
 
 lib@GL_LIB@_la_LIBADD = \
        $(top_builddir)/src/mesa/libmesa.la \
-       $(top_builddir)/src/mapi/glapi/libglapi.la
-lib@GL_LIB@_la_LDFLAGS = \
-       -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
+       $(top_builddir)/src/mapi/glapi/libglapi.la \
+       $(SHARED_GLAPI_LIB) \
        $(GL_LIB_DEPS)
 
-if HAVE_SHARED_GLAPI
-lib@GL_LIB@_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) -l$(GLAPI_LIB)
-endif
+lib@GL_LIB@_la_LDFLAGS = \
+       -no-undefined \
+       -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
+       $(GC_SECTIONS) \
+       $(LD_NO_UNDEFINED)
 
-# 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.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.$(GL_MAJOR)
-       ln -sf lib@GL_LIB@.so.$(GL_MAJOR) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so
+include $(top_srcdir)/install-lib-links.mk