Mesa (master): Use GLW_CFLAGS when building libGLw

Dan Nicholson dbn at kemper.freedesktop.org
Thu Jul 1 20:03:02 UTC 2010


Module: Mesa
Branch: master
Commit: 442c37e2ef57d8dcf88c91d457df7f6516d76264
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=442c37e2ef57d8dcf88c91d457df7f6516d76264

Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Thu Jul  1 12:58:57 2010 -0700

Use GLW_CFLAGS when building libGLw

We check for libX11 and libXt, so we might as well use the CFLAGS
pkg-config tells us about.

---

 configs/autoconf.in |    1 +
 src/glw/Makefile    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 4a86dc1..78fa0af 100644
--- 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 1fb3d3c..39352f0 100644
--- 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) $<
 
 
 




More information about the mesa-commit mailing list