Merge branch 'mesa_7_7_branch'

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

diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index fa8dffcb3ef307228310fedb0de9cb1d1cefd8a6..9010bbd130a5ed10bf67e5f3b1b3c02d4c4860a7 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -19,50 +19,33 @@ INCLUDE_DIRS = \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/mesa/main
 
-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
-
-
-.PHONY: osmesa8
-.PHONY: osmesa16
+# Standalone osmesa needs to be linked with core Mesa APIs
+ifeq ($(DRIVER_DIRS), osmesa)
+CORE_MESA = \
+       $(TOP)/src/mesa/libmesa.a \
+       $(TOP)/src/mesa/libglapi.a \
+       $(TOP)/src/glsl/cl/libglslcl.a \
+       $(TOP)/src/glsl/pp/libglslpp.a
+else
+CORE_MESA =
+endif
 
 
 .c.o:
        $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
 
 
-default:
-# $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-       @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-               $(MAKE) osmesa16 ; \
-       else \
-               $(MAKE) osmesa8 ; \
-       fi
-
-
-
-
-# The normal libOSMesa is used in conjuction with libGL
-osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
-
-$(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
-       $(TOP)/bin/mklib -o $(OSMESA_LIB) \
-               -linker "$(CC)" \
-               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) \
-               $(MKLIB_OPTIONS) \
-               $(OSMESA_LIB_DEPS) $(OBJECTS)
-
-
+default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 
-# The libOSMesa16/libOSMesa32 libraries do not use libGL but rather are built
-# with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
-osmesa16: $(OBJECTS) $(CORE_MESA)
-       $(TOP)/bin/mklib -o $(OSMESA_LIB) \
-               -linker "$(CC)" \
+# libOSMesa can be used in conjuction with libGL or with all other Mesa
+# sources. We can also build libOSMesa16/libOSMesa32 by setting
+# -DCHAN_BITS=16/32.
+$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
+       $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) \
-               $(MKLIB_OPTIONS) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+               -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
                $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)