mesa: use new look-up table to get texel fetch/store funcs

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

diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile
index 9104fd8edfd8b604886ebf1b1618467899053bea..a9f8684c9bd95eaa59a72b5aa5eb73c85434adbf 100644 (file)
--- a/src/glut/beos/Makefile
+++ b/src/glut/beos/Makefile
@@ -52,7 +52,8 @@ C_SOURCES = \
        glut_shapes.c \
        glut_teapot.c \
        glut_vidresize.c \
-       glut_util.c 
+       glut_util.c \
+       glut_ext.c
 
 OBJECTS = \
        $(CPP_SOURCES:.cpp=.o) \
@@ -63,8 +64,6 @@ INCLUDES = \
        -I- \
        -I$(TOP)/include
 
-DEFINES += -DGLUT_API_VERSION=4
-
 # Rules
 
 .cpp.o:
@@ -76,23 +75,25 @@ DEFINES += -DGLUT_API_VERSION=4
 
 # ---- TARGETS
 
-default: $(LIB_DIR) $(LIB_DIR)/$(GLUT_LIB_NAME)
+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Create the lib directory if missing
-$(LIB_DIR):
-       mkdir $(LIB_DIR)
+$(TOP)/$(LIB_DIR):
+       mkdir $(TOP)/$(LIB_DIR)
 
 # Make the library
-$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLUT_LIB) -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
-               -install $(LIB_DIR) $(MKLIB_OPTIONS) $(GLUT_LIB_DEPS) \
-               $(OBJECTS)
+$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
+       @$(MKLIB) -o $(GLUT_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+               $(GLUT_LIB_DEPS) $(OBJECTS)
 
 clean:
        -rm -f *.o
 
 depend: $(SOURCES)
+       rm -f depend
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
 include depend