Quote $(CC) and $(CXX) so that 'CC=ccache gcc' and 'CXX=ccache g++' will

work again.

diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile
index de6c028..69a4ea8 100644 (file)
--- a/src/glu/mesa/Makefile
+++ b/src/glu/mesa/Makefile
@@ -45,7 +45,7 @@ $(LIB_DIR):
 
 # Make the library:
 $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GLU_LIB) -linker $(CC) \
+       @ $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CC)' \
                -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
                $(MKLIB_OPTIONS) -install $(LIB_DIR) \
                $(GLU_LIB_DEPS) $(OBJECTS)

diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile
index 30372c9..46dafe9 100644 (file)
--- a/src/glu/sgi/Makefile
+++ b/src/glu/sgi/Makefile
@@ -136,7 +136,7 @@ $(LIB_DIR):
 
 # Make the library:
 $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLU_LIB) -linker $(CXX) \
+       $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
                -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
                -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
                $(GLU_LIB_DEPS) $(OBJECTS)

diff --git a/src/glut/ggi/Makefile b/src/glut/ggi/Makefile
index f46da59..61cfcee 100644 (file)
--- a/src/glut/ggi/Makefile
+++ b/src/glut/ggi/Makefile
@@ -32,7 +32,7 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Make the library
 $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLUT_LIB) -linker $(CC) \
+       $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \
                -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
                -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
                $(GLUT_LIB_DEPS) $(OBJECTS)

diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index e345c8d..3a85d3e 100644 (file)
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -90,7 +90,7 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Make the library
 $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLUT_LIB) -linker $(CC) \
+       $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \
                -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
                $(MKLIB_OPTIONS) -install $(LIB_DIR) \
                $(GLUT_LIB_DEPS) $(OBJECTS)

diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index ffd224e..cb82384 100644 (file)
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -55,7 +55,7 @@ default: depend $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Make the library
 $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLUT_LIB) -linker $(CC) \
+       $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \
                -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
                $(GLUT_LIB_DEPS) -install $(LIB_DIR) \
                $(MKLIB_OPTIONS) $(OBJECTS)

diff --git a/src/glw/Makefile b/src/glw/Makefile
index 12719f7..3c66c67 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -33,7 +33,7 @@ clean:
 
 # Make the library
 $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLW_LIB) -linker $(CC) \
+       $(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \
                -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
                $(MKLIB_OPTIONS) -install $(LIB_DIR) \
                $(GLW_LIB_DEPS) $(OBJECTS)

diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index a9bced2..18ea8b1 100644 (file)
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -55,7 +55,7 @@ default: depend $(LIB_DIR)/$(GL_LIB_NAME)
 
 # Make libGL
 $(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-       $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
+       $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
                -major 1 -minor 2 $(MKLIB_OPTIONS) \
                -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
        rm -f $(LIB_DIR)/miniglx.conf

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 3ffa478..ece9384 100644 (file)
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -88,7 +88,7 @@ dispatch.c:
 
 # Make libGL
 $(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-       $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
+       $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
                -major 1 -minor 2 $(MKLIB_OPTIONS) \
                -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
 

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 7a17bf5..b6c0b85 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -96,7 +96,7 @@ LIBGL_CORE_OBJECTS =  \
 
 # Make libGL from core object files
 libgl-core: $(LIBGL_CORE_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
+       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
                -install $(LIB_DIR) $(MKLIB_OPTIONS) $(LIBGL_CORE_OBJECTS) $(GL_LIB_DEPS)
 
@@ -150,7 +150,7 @@ subdirs:
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
+       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
                -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
                -install $(LIB_DIR) \
                $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
@@ -158,13 +158,13 @@ $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
 # Make the OSMesa library
 $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
        @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-               $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker $(CC) \
+               $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
                        -major $(MESA_MAJOR) \
                        -minor $(MESA_MINOR) -patch $(MESA_TINY) \
                        -install $(LIB_DIR) $(MKLIB_OPTIONS) \
                        $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
        else \
-               $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker $(CC) \
+               $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
                        -major $(MESA_MAJOR) \
                        -minor $(MESA_MINOR) -patch $(GL_TINY) \
                        -install $(LIB_DIR) $(MKLIB_OPTIONS) \