Put quotes around the CC and CXX variables passed to mklib. This make

[mesa.git] / src / glx / x11 / Makefile

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index ee2bae128d809f911e8aa8b0d9f64a7de3019b7c..910db404b5d8a21466a7a47df84dd77de4e11e24 100644 (file)
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -24,13 +24,12 @@ C_SOURCES = \
          compsize.c \
          dispatch.c \
          eval.c \
-         g_render.c \
-         g_single.c \
-         g_vendpriv.c \
          glxcmds.c \
          glxext.c \
          glxextensions.c \
+         indirect.c \
          indirect_init.c \
+         indirect_size.c \
          indirect_window_pos.c \
          indirect_transpose_matrix.c \
          pixel.c \
@@ -54,9 +53,7 @@ X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
 OBJECTS = $(C_SOURCES:.c=.o) \
          $(ASM_SOURCES:.S=.o)
 
-INCLUDES = -I. $(INCLUDE_DIRS)
-
-INCLUDE_DIRS = \
+INCLUDES = -I. \
        -I$(TOP)/include \
        -I$(TOP)/include/GL/internal \
        -I$(TOP)/src/mesa \
@@ -68,7 +65,8 @@ INCLUDE_DIRS = \
        -I$(TOP)/src/mesa/swrast_setup \
        -I$(TOP)/src/mesa/drivers/dri/common \
        -I$(DRM_SOURCE_PATH)/libdrm \
-       -I$(DRM_SOURCE_PATH)/shared
+       -I$(DRM_SOURCE_PATH)/shared \
+       $(X11_INCLUDES)
 
 
 ##### RULES #####
@@ -88,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)
 
 
@@ -99,7 +97,7 @@ drmtest: xf86drm.o drmtest.o
 depend: $(C_SOURCES) $(ASM_SOURCES)
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
-               > /dev/null 2>&1
+               > /dev/null 
 
 
 # Emacs tags