projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5b28844)
Put quotes around the CC and CXX variables passed to mklib. This make
authorIan Romanick <idr@us.ibm.com>
Tue, 11 Jan 2005 22:43:45 +0000 (22:43 +0000)
committerIan Romanick <idr@us.ibm.com>
Tue, 11 Jan 2005 22:43:45 +0000 (22:43 +0000)
them work with multi-work compiler names (e.g., "ccache gcc").

src/glu/mesa/Makefile patch | blob | history
src/glu/sgi/Makefile patch | blob | history
src/glut/ggi/Makefile patch | blob | history
src/glut/glx/Makefile patch | blob | history
src/glut/mini/Makefile patch | blob | history
src/glw/Makefile patch | blob | history
src/glx/mini/Makefile patch | blob | history
src/glx/x11/Makefile patch | blob | history
src/mesa/Makefile patch | blob | history
src/mesa/drivers/dri/x11/Makefile patch | blob | history

diff --git a/src/glu/mesa/Makefile b/src/glu/mesa/Makefile
index a09c37ce5fe3489038e0ffc7a34c0f0bff053338..0924cf89403764d045248c23b28de7ddefd27085 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)
-       @CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
+       @CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLU_LIB) -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 995dc366508ea1e299c927bff62d61e512b3ea28..19f5e280b7a85c70b8737b267ec3b67c2eb8d1d8 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)
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLU_LIB) -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 ebd8dc65e95fefd48b84f512dabce57883579827..a5ffcecea86df6d6e448c0148a53d3b7d4d692ad 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)
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLUT_LIB) \
                -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 161122ac91168494700367f02ddaf5576cc557f9..6c6712ec9e5831c123673f826ed9bd9a9447bb09 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)
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLUT_LIB) \
                -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 ab8fe3e19f1e0eb67d41d1f7b53c88e955986138..c1dc5c5a0549ae7c37e83476c4959694b9c38f6e 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)
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLUT_LIB) \
                -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 36b70ee57efbad6eb6c3f3eb5534ea3657565473..b426d755c5cdcfd10b16b9ddb3100aa8f404ab48 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -33,7 +33,7 @@ clean:
 
 # Make the library
 $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLW_LIB) -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 7c2687b014a22083fdd32e9ab4e7fa22c43652af..612610526e85b235b3086ba78c50fcc201555452 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
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
                -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
        rm -f $(LIB_DIR)/miniglx.conf
        install example.miniglx.conf $(LIB_DIR)/miniglx.conf
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 37d55c783a7584f097210e7d6d8d5e6eb9a482ba..910db404b5d8a21466a7a47df84dd77de4e11e24 100644 (file)
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -86,7 +86,7 @@ glcontextmodes.c:
 
 # Make libGL
 $(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
                -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
 
 
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 363e48c2d60b29c0d3baf424c7ebb37c7a2e395c..272ecd0a1cd59b3581afc557d6ed122359b025fd 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -90,7 +90,7 @@ LIBGL_CORE_OBJECTS =  \
 
 # Make libGL from core object files
 libgl-core: $(LIBGL_CORE_OBJECTS)
-       @ CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) \
+       @ CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
                -install $(LIB_DIR) $(MKLIB_OPTIONS) $(LIBGL_CORE_OBJECTS) $(GL_LIB_DEPS)
 
diff --git a/src/mesa/drivers/dri/x11/Makefile b/src/mesa/drivers/dri/x11/Makefile
index 3b0b2e2848d1a8f8d36400b3d159e9df816edd7b..76c157b0958e3922be19ec6bbe96b55cb6a34c84 100644 (file)
--- a/src/mesa/drivers/dri/x11/Makefile
+++ b/src/mesa/drivers/dri/x11/Makefile
@@ -67,7 +67,7 @@ default: depend $(LIB_DIR)/$(LIBNAME)
 
 
 $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
                $(OBJECTS) $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES)