egl: turn one more boolean `int` into a `bool`

[mesa.git] / src / glx / Makefile.am

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 94563d61deb9a344a2e87e037e6110a02fd0e5e6..b306bcc08db1efebe96f4a9819f8abdb863b0a4d 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -20,12 +20,13 @@
 # IN THE SOFTWARE.
 
 if HAVE_SHARED_GLAPI
-SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
 SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
 
 SUBDIRS =
 
+EXTRA_DIST = SConscript
+
 if HAVE_XF86VIDMODE
 EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
 endif
@@ -33,13 +34,13 @@ endif
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/include/GL/internal \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/loader \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_srcdir)/src/mapi/glapi \
        -I$(top_builddir)/src/mapi \
+       -I$(top_srcdir)/src/mapi \
        -I$(top_builddir)/src/mapi/glapi \
+       -I$(top_srcdir)/src/mapi/glapi \
        $(VISIBILITY_CFLAGS) \
-       $(SHARED_GLAPI_CFLAGS) \
        $(EXTRA_DEFINES_XF86VIDMODE) \
        -D_REENTRANT \
        -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
@@ -59,24 +60,34 @@ libglx_la_SOURCES = \
        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 \
@@ -90,13 +101,16 @@ libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
 
 if HAVE_DRISW
 libglx_la_SOURCES += \
-       drisw_glx.c
+       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
 
@@ -104,13 +118,21 @@ if HAVE_DRI2
 libglx_la_SOURCES += \
        dri2.c \
        dri2_glx.c \
+       dri2.h \
+       dri2_priv.h \
        dri_glx.c \
-       XF86dri.c
+       dri_sarea.h \
+       XF86dri.c \
+       xf86dri.h \
+       xf86dristr.h
 endif
 
 if HAVE_DRI3
 libglx_la_SOURCES += \
-          dri3_glx.c
+       dri3_glx.c \
+       dri3_priv.h
+
+libglx_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la
 endif
 
 if HAVE_APPLEDRI
@@ -121,7 +143,39 @@ 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 = \
+       $(LIBDRM_LIBS) \
        libglx.la \
        $(top_builddir)/src/mapi/glapi/libglapi.la \
        $(SHARED_GLAPI_LIB) \
@@ -129,7 +183,7 @@ GL_LIBS = \
 
 GL_LDFLAGS = \
        -no-undefined \
-       -version-number 1:2 \
+       -version-number $(GL_LIB_VERSION) \
        $(BSYMBOLIC) \
        $(GC_SECTIONS) \
        $(LD_NO_UNDEFINED)
@@ -138,6 +192,10 @@ 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
+
 SUBDIRS += . tests
 
 include $(top_srcdir)/install-lib-links.mk