--- src/mesa/drivers/osmesa/Makefile.am	2012-08-26 19:40:33.000000000 +0200
+++ src/mesa/drivers/osmesa/Makefile.am	2012-08-27 00:16:28.102144063 +0200
@@ -34,12 +34,19 @@
 lib_LTLIBRARIES = lib@OSMESA_LIB@.la
 
 lib@OSMESA_LIB@_la_SOURCES = osmesa.c
+nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cxx
 
 lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @VERSION_NUMBER@ -no-undefined
 lib@OSMESA_LIB@_la_LIBADD = \
 	$(top_builddir)/src/mesa/libmesa.la \
 	$(top_builddir)/src/mapi/glapi/libglapi.la
 
+if HAVE_SHARED_GLAPI
+lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+endif
+
+lib@OSMESA_LIB@_la_LIBADD += $(OSMESA_LIB_DEPS)
+
 if BUILD_SHARED
 # 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.