i965: Switch over to fully external-or-not MOCS scheme

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

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index cfab70216aca97a05823df031fb44fae0ea36642..3c7def5c5c92287a4474bad34269fec1beb5fb3a 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -21,10 +21,17 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+EXTRA_DIST = osmesa.def SConscript
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_builddir)/src/mapi \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mapi/glapi \
+       -I$(top_srcdir)/src/mapi/glapi \
        -I$(top_srcdir)/src/mesa/ \
        $(DEFINES)
 AM_CFLAGS = $(PTHREAD_CFLAGS) \
@@ -36,10 +43,10 @@ nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
 lib@OSMESA_LIB@_la_SOURCES = osmesa.c
 
 lib@OSMESA_LIB@_la_LDFLAGS = \
-       -module \
        -no-undefined \
        -version-number @OSMESA_VERSION@ \
-       -Wl,--no-undefined
+       $(GC_SECTIONS) \
+       $(LD_NO_UNDEFINED)
 
 
 if HAVE_SHARED_GLAPI