ir_constant_expression: Declare loop counting variables in the loops.

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

diff --git a/src/mesa/drivers/fbdev/Makefile b/src/mesa/drivers/fbdev/Makefile
index ac43dfdb676e9dab20c4871bb06a2edd8ea113d8..5120e1ac9e559bbdc5fd025867a6cb475f5f5c98 100644 (file)
--- a/src/mesa/drivers/fbdev/Makefile
+++ b/src/mesa/drivers/fbdev/Makefile
@@ -11,10 +11,11 @@ OBJECTS = $(SOURCES:.c=.o)
 
 INCLUDE_DIRS = \
        -I$(TOP)/include \
+       -I$(TOP)/src/mapi \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/mesa/main
 
-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
+CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mapi/glapi/libglapi.a
 
 
 .c.o:
@@ -24,9 +25,8 @@ CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
 default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
 
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(CORE_OBJECTS) $(OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) \
-               -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(CORE_MESA) $(OBJECTS)
+       @ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
                -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                $(CORE_MESA) $(OBJECTS) $(GL_LIB_DEPS)