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 514e95d0013b8e8970fda436b83e6836cf4d6707..3c7def5c5c92287a4474bad34269fec1beb5fb3a 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -1,6 +1,6 @@
 
 
-# Copyright © 2012 Matt Turner <mattst88@gmail.com>
+# Copyright © 2012 Laurent Carlier <lordheavym@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,62 +21,45 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-# Hack to make some of the non-automake variables work.
-TOP = $(top_srcdir)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = osmesa.pc
+EXTRA_DIST = osmesa.def SConscript
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
+       -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_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mesa/main
-
-LIBADD = \
-       $(top_srcdir)/src/mesa/libmesa.a \
-       $(top_srcdir)/src/mapi/glapi/libglapi.a \
-       $(top_srcdir)/src/glsl/libglsl.a \
-       $(OSMESA_LIB_DEPS)
-
-if BUILD_SHARED
-LIBOSMESA = lib$(OSMESA_LIB).so
-endif
+       -I$(top_builddir)/src/mapi/glapi \
+       -I$(top_srcdir)/src/mapi/glapi \
+       -I$(top_srcdir)/src/mesa/ \
+       $(DEFINES)
+AM_CFLAGS = $(PTHREAD_CFLAGS) \
+       $(VISIBILITY_CFLAGS)
 
-if BUILD_STATIC
-LIBOSMESA = lib$(OSMESA_LIB).a
-endif
+lib_LTLIBRARIES = lib@OSMESA_LIB@.la
 
-if HAVE_OSMESA8
-lib_LTLIBRARIES = libOSMesa.la
+nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
+lib@OSMESA_LIB@_la_SOURCES = osmesa.c
 
-libOSMesa_la_SOURCES = osmesa.c
-libOSMesa_la_LDFLAGS = -no-undefined -version-info 8:0:0 #FIXME
-libOSMesa_la_LIBADD = $(LIBADD)
-endif
+lib@OSMESA_LIB@_la_LDFLAGS = \
+       -no-undefined \
+       -version-number @OSMESA_VERSION@ \
+       $(GC_SECTIONS) \
+       $(LD_NO_UNDEFINED)
 
-if HAVE_OSMESA16
-lib_LTLIBRARIES = libOSMesa16.la
 
-libOSMesa16_la_SOURCES = osmesa.c
-libOSMesa16_la_LDFLAGS = -no-undefined -version-info 8:0:0 # FIXME
-libOSMesa16_la_LIBADD = $(LIBADD)
+if HAVE_SHARED_GLAPI
+SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
 
-if HAVE_OSMESA32
-lib_LTLIBRARIES = libOSMesa32.la
+lib@OSMESA_LIB@_la_LIBADD = \
+       $(top_builddir)/src/mesa/libmesa.la \
+       $(top_builddir)/src/mapi/glapi/libglapi.la \
+       $(SHARED_GLAPI_LIB) \
+       $(OSMESA_LIB_DEPS)
 
-libOSMesa32_la_SOURCES = osmesa.c
-libOSMesa32_la_LDFLAGS = -no-undefined -version-info 8:0:0 # FIXME
-libOSMesa32_la_LIBADD = $(LIBADD)
-endif
+include $(top_srcdir)/install-lib-links.mk
 
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the library into /lib of the build tree.
-all-local: lib$(OSMESA_LIB).la
-       $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-if BUILD_SHARED
-       ln -f .libs/$(LIBOSMESA).8.0.0 $(top_builddir)/$(LIB_DIR)/$(LIBOSMESA).8.0.0;
-       ln -f .libs/$(LIBOSMESA).8 $(top_builddir)/$(LIB_DIR)/$(LIBOSMESA).8;
-endif
-       ln -f .libs/$(LIBOSMESA) $(top_builddir)/$(LIB_DIR)/$(LIBOSMESA);
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = osmesa.pc