projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3086efe)
Use X11_INCLUDES config macro instead of
authorJerome Glisse <glisse@freedesktop.org>
Mon, 2 Jan 2006 18:47:00 +0000 (18:47 +0000)
committerJerome Glisse <glisse@freedesktop.org>
Mon, 2 Jan 2006 18:47:00 +0000 (18:47 +0000)
hardcoded path in makefile.

src/glut/glx/Makefile patch | blob | history
src/glw/Makefile patch | blob | history

diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 3a85d3eb9b340138b51ad68be298bda43f47aa70..86920aba99d398519f681e97dcdeba0bcb380438 100644 (file)
--- 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) $<
 
 
 
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 3c66c6778fc994186544cc1158c3ca581d16898a..e21cbbd405407ed8e3dfac342622803ec20b386a 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -7,7 +7,7 @@ MAJOR = 1
 MINOR = 0
 TINY = 0
 
-INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include
+INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 $(X11_INCLUDES)
 
 
 OBJECTS = $(GLW_SOURCES:.c=.o)