X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglut%2Fglx%2FMakefile;h=86920aba99d398519f681e97dcdeba0bcb380438;hb=2b3aab071760c15abfbd99c070cf368d715e5173;hp=12c873d5112310ac76f92fb9da39e589e2a7abe2;hpb=3903c1f2bcd96cd115eae0ed0f42e492684237ec;p=mesa.git

diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 12c873d5112..86920aba99d 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -79,7 +79,7 @@ OBJECTS = $(SOURCES:.c=.o)
 ##### RULES #####
 
 .c.o:
-	$(CC) -c -I$(TOP)/include $(CFLAGS) $(GLUT_CFLAGS) $<
+	$(CC) -c -I$(TOP)/include $(X11_INCLUDES) $(CFLAGS) $(GLUT_CFLAGS) $<
 
 
 
@@ -90,9 +90,9 @@ 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) \
-		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
-		-patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+	$(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)
 
 
@@ -101,12 +101,13 @@ clean:
 	-rm -f *.lo
 	-rm -f *.la
 	-rm -rf .libs
+	-rm -rf depend depend.bak
 
 
 depend: $(SOURCES)
 	@ echo "running $(MKDEP)"
 	@ touch depend
 	@ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
-		> /dev/null 2>&1
+		> /dev/null 
 
 include depend