projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9617254)
Use GLW_CFLAGS when building libGLw
authorDan Nicholson <dbn.lists@gmail.com>
Thu, 1 Jul 2010 19:58:57 +0000 (12:58 -0700)
committerDan Nicholson <dbn.lists@gmail.com>
Thu, 1 Jul 2010 20:00:02 +0000 (13:00 -0700)
We check for libX11 and libXt, so we might as well use the CFLAGS
pkg-config tells us about.

configs/autoconf.in patch | blob | history
src/glw/Makefile patch | blob | history

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 4a86dc1bb5cc6d68cc3c75bfa856054943436fd9..78fa0af6cc10beef89124b4f6715f4d9df2bafef 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -31,6 +31,7 @@ X11_CFLAGS = @X11_CFLAGS@
 LLVM_CFLAGS = @LLVM_CFLAGS@
 LLVM_LDFLAGS = @LLVM_LDFLAGS@
 LLVM_LIBS = @LLVM_LIBS@
+GLW_CFLAGS = @GLW_CFLAGS@
 GLUT_CFLAGS = @GLUT_CFLAGS@
 
 
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 1fb3d3c320223402ddb137a17646b6cba11f4b16..39352f0532022b7a7a4111df6c7828af058ba855 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
 ##### RULES #####
 
 .c.o:
-       $(CC) -c $(INCDIRS) $(CFLAGS) $<
+       $(CC) -c $(INCDIRS) $(CFLAGS) $(GLW_CFLAGS) $<