Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / glu / mesa / Makefile

diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile
index 6a48077e954740c4488b38ad02555318881d5ea7..c468ce6210022b45516c4ac97f775ed5eb7a0cf5 100644 (file)
--- a/src/glu/mesa/Makefile
+++ b/src/glu/mesa/Makefile
@@ -23,7 +23,7 @@ C_SOURCES = \
 
 OBJECTS = $(C_SOURCES:.c=.o)
 
-INCLUDES = -I. -I- -I$(TOP)/include
+INCLUDES = -I. -I$(TOP)/include
 
 ##### RULES #####
 
@@ -34,20 +34,20 @@ INCLUDES = -I. -I- -I$(TOP)/include
 
 default:
        @if [ "${CONFIG_NAME}" = "beos" ] ; then \
-               echo "GLU library not build under BeOS: integrated into ${LIB_DIR}/${GL_LIB_NAME} library." ; \
+               echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \
                exit 0 ; \
        else \
-               $(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \
+               $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) || exit 1 ; \
        fi
 
-$(LIB_DIR):
-       -mkdir $(LIB_DIR)
+$(TOP)/$(LIB_DIR):
+       -mkdir $(TOP)/$(LIB_DIR)
 
 # Make the library:
-$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-       @CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
-               -minor $(GLU_MINOR) -patch $(GLU_TINY) \
-               $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+       @ $(MKLIB) -o $(GLU_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+               $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
                $(GLU_LIB_DEPS) $(OBJECTS)
 
 clean: