Sketch of codegen templates for t_vtx_api.c, not complete

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

diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 2925d6eaa23d9733ad5d287ef0d0a6a04f2cf0c2..5102528585fd51d1e25e5f59a2ed689193358259 100644 (file)
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -8,9 +8,11 @@ GLU_MAJOR = 1
 GLU_MINOR = 3
 GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
+GLU_LIB_NAME = "GLU"  # may be overridden in Make-config
+
 VPATH = RCS
 
-TOP = ..
+TOP = ../../..
 INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
 LIBDIR = $(TOP)/lib
 
@@ -129,18 +131,19 @@ default:
        @echo "Specify a target configuration"
 
 clean:
-       -rm *.o */*.o */*/*.o
-       -rm *.lo */*.lo */*/*.lo
-       -rm *.la */*.la */*/*.la
+       -rm -f *.o */*.o */*/*.o
+       -rm -f *.lo */*.lo */*/*.lo
+       -rm -f *.la */*.la */*/*.la
 
 
 targets: $(LIBDIR)/$(GLU_LIB)
 
 # Make the library:
 $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
-       $(TOP)/bin/mklib -o GLU -major $(GLU_MAJOR) -minor $(GLU_MINOR) \
-               -patch $(GLU_TINY) $(GLU_LIB_DEPS) -cplusplus \
-               -install $(LIBDIR) $(OBJECTS)
+       $(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
+               -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+               $(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) \
+               $(MKLIB_OPTIONS) $(OBJECTS)