automake: don't enable -Wl,--no-undefined on OpenBSD

[mesa.git] / src / gallium / targets / libgl-xlib / Makefile.am

diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index 2b697fc35d11cf43e4867b477233bb863b2c7b6a..4ee364e7366e0c14ac53f3c0604a2ee228e8e37c 100644 (file)
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -33,38 +33,40 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/drivers \
        -I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \
        -I$(top_srcdir)/src/gallium/auxiliary \
+       -I$(top_srcdir)/src/gallium/winsys \
        -DGALLIUM_SOFTPIPE \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_GALAHAD
-AM_CFLAGS = $(X11_CFLAGS)
+AM_CFLAGS = $(X11_INCLUDES)
 
 lib_LTLIBRARIES = libGL.la
 
+nodist_EXTRA_libGL_la_SOURCES = dummy.cpp
 libGL_la_SOURCES = xlib.c
-libGL_la_LDFLAGS = -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) -no-undefined
+libGL_la_LDFLAGS = \
+       -no-undefined \
+       -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \
+       $(GC_SECTIONS) \
+       $(LD_NO_UNDEFINED)
 
 libGL_la_LIBADD = \
-       $(top_builddir)/src/gallium/state_trackers/glx/libxlib.la \
+       $(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \
        $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
+       $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
        $(top_builddir)/src/mapi/glapi/libglapi.la \
        $(top_builddir)/src/mesa/libmesagallium.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       -lpthread
+       $(GL_LIB_DEPS) \
+       $(CLOCK_LIB)
 
 if HAVE_MESA_LLVM
 libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
 libGL_la_LDFLAGS += $(LLVM_LDFLAGS)
-else
-libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
 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: libGL.la
-       $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
-       ln -f .libs/libGL.so* $(top_builddir)/$(LIB_DIR)/gallium/
+include $(top_srcdir)/install-gallium-links.mk