Merge branch '7.8' into master

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

diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile
index 940c14901aa5d12f4cbe3da9a81d87d699ba6256..20c3bed0c9354ff4f9505c2f99f9f0b429f27e19 100644 (file)
--- a/src/glu/sgi/Makefile
+++ b/src/glu/sgi/Makefile
@@ -12,7 +12,6 @@ GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
 
-
 C_SOURCES = \
        libutil/error.c         \
        libutil/glue.c          \
@@ -124,13 +123,23 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
 
 ##### TARGETS #####
 
-default: $(LIB_DIR)/$(GLU_LIB_NAME)
+default:
+       @if [ "${CONFIG_NAME}" = "beos" ] ; then \
+               echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \
+               exit 0 ; \
+       else \
+               $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) || exit 1 ; \
+       fi
+
+$(TOP)/$(LIB_DIR):
+       -mkdir $(TOP)/$(LIB_DIR)
 
 # Make the library:
-$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
-               -minor $(GLU_MINOR) -patch $(GLU_TINY) \
-               -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+       $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+               -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+               -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
+               -exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
                $(GLU_LIB_DEPS) $(OBJECTS)