mesa: new driver meta-ops module

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

diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile
index 3b1038b0d475d85abb11e5cbff6911a0c06730ce..c79dd24c390a17f9b1b8702946eaaad8bcaa5bb0 100644 (file)
--- a/src/mesa/drivers/beos/Makefile
+++ b/src/mesa/drivers/beos/Makefile
@@ -11,7 +11,7 @@ MESA_MODULES = $(TOP)/src/mesa/mesa.a
 
 # GLU_DIR      = $(TOP)/src/glu/mesa
 ifeq ($(GLU_DIR),)
-       # By default, we build the SGI GLU implementation
+# By default, we build the SGI GLU implementation
        GLU_DIR = $(TOP)/src/glu/sgi
 endif
 
@@ -146,9 +146,9 @@ DRIVER_SOURCES = \
 ifeq ($(CPU), x86)
        DRIVER_SOURCES += $(addprefix ../../, $(X86_API))
 else
-       # No GL API PPC optimization yet
+# No GL API PPC optimization yet
 endif 
-       
+
 DRIVER_OBJECTS = $(DRIVER_SOURCES:.c=.o)
 DRIVER_OBJECTS := $(DRIVER_OBJECTS:.S=.o)
 
@@ -167,29 +167,33 @@ OBJECTS := $(DRIVER_OBJECTS:.cpp=.o)
        $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
 
 
-default: depend $(LIB_DIR) $(LIB_DIR)/$(GL_LIB_NAME)
+default: depend $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
+# XXX FIXME: mesa.a might be libmesa.a now
 $(MESA_MODULES):
-       cd $(TOP)/src/mesa; $(MAKE) mesa.a ;
-       
+       cd $(TOP)/src/mesa && $(MAKE) mesa.a ;
+       mimeset -f "$@"
+
 $(GLU_MODULES):
-       cd $(GLU_DIR); $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ; 
-       
-$(LIB_DIR):
-       mkdir $(LIB_DIR)
+       cd $(GLU_DIR) && $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ;
 
-$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
-       @$(TOP)/bin/mklib -o $(GL_LIB) -install $(LIB_DIR) -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
+$(TOP)/$(LIB_DIR):
+       mkdir $(TOP)/$(LIB_DIR)
+
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
+       @$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(GL_LIB_DEPS) \
+               $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
 
 # $(GLU_OBJECTS):
-#      cd $(GLU_DIR); $(MAKE) $< ;
+#      cd $(GLU_DIR) && $(MAKE) $< ;
 
 depend: $(DRIVER_SOURCES) $(GLU_SOURCES)
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null 
 
 clean:
-       rm -f depend $(OBJECTS)
-               
+       -rm -f depend depend.bak $(OBJECTS)
+
 include depend