From 92cb9143213ccef5d6f9b825796490bd3c1c0881 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Sat, 14 Aug 2004 14:24:48 +0000 Subject: [PATCH] Add a guard to stop building libGLU.so under BeOS, as it's build into libGL.so. --- src/glu/sgi/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile index f1d0d70ebf8..3ca696ff258 100644 --- 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,7 +123,16 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS) ##### TARGETS ##### -default: $(LIB_DIR)/$(GLU_LIB_NAME) +default: + @if [ "${CONFIG_NAME}" = "beos" ] ; then \ + echo "GLU library not build under BeOS: integrated into ${LIB_DIR}/${GL_LIB_NAME} library." ; \ + exit 0 ; \ + else \ + $(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \ + fi + +$(LIB_DIR): + -mkdir $(LIB_DIR) # Make the library: $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) -- 2.30.2