diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:16:03 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-15 11:16:03 +0000 |
commit | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (patch) | |
tree | ed66dfad2f0907967e4c5e40a338b6a143b1dd7b /src/glu | |
parent | f72848a09a9d3069705fbe8e4daa29b9918ea56e (diff) | |
parent | e72a44215312ae1f3c812ba28e47b4aec3589de9 (diff) |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/glu')
-rw-r--r-- | src/glu/Makefile | 6 | ||||
-rw-r--r-- | src/glu/glu.pc.in | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/glu/Makefile b/src/glu/Makefile index b025a90b67..e519dfeec4 100644 --- a/src/glu/Makefile +++ b/src/glu/Makefile @@ -18,7 +18,11 @@ pcedit = sed \ -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \ -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ - -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' + -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ + -e 's,@GLU_PC_REQ@,$(GLU_PC_REQ),' \ + -e 's,@GLU_PC_REQ_PRIV@,$(GLU_PC_REQ_PRIV),' \ + -e 's,@GLU_PC_LIB_PRIV@,$(GLU_PC_LIB_PRIV),' \ + -e 's,@GLU_PC_CFLAGS@,$(GLU_PC_CFLAGS),' glu.pc: glu.pc.in $(pcedit) $< > $@ diff --git a/src/glu/glu.pc.in b/src/glu/glu.pc.in index 8606b9b222..bc2517e90e 100644 --- a/src/glu/glu.pc.in +++ b/src/glu/glu.pc.in @@ -5,7 +5,9 @@ includedir=@INSTALL_INC_DIR@ Name: glu Description: Mesa OpenGL Utility library -Requires: gl +Requires: @GLU_PC_REQ@ +Requires.private: @GLU_PC_REQ_PRIV@ Version: @VERSION@ Libs: -L${libdir} -lGLU -Cflags: -I${includedir} +Libs.private: @GLU_PC_LIB_PRIV@ +Cflags: -I${includedir} @GLU_PC_CFLAGS@ |