diff options
| author | Alan Hourihane <[email protected]> | 2008-12-15 11:16:03 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-12-15 11:16:03 +0000 |
| commit | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (patch) | |
| tree | ed66dfad2f0907967e4c5e40a338b6a143b1dd7b /src/glut/mini | |
| parent | f72848a09a9d3069705fbe8e4daa29b9918ea56e (diff) | |
| parent | e72a44215312ae1f3c812ba28e47b4aec3589de9 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/glut/mini')
| -rw-r--r-- | src/glut/mini/Makefile | 5 | ||||
| -rw-r--r-- | src/glut/mini/glut.pc.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile index 7e7afc35337..841a473f891 100644 --- a/src/glut/mini/Makefile +++ b/src/glut/mini/Makefile @@ -78,7 +78,10 @@ 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@,$(GLUT_MAJOR).$(GLUT_MINOR).$(GLUT_TINY),' + -e 's,@VERSION@,$(GLUT_MAJOR).$(GLUT_MINOR).$(GLUT_TINY),' \ + -e 's,@GLUT_PC_REQ_PRIV@,$(GLUT_PC_REQ_PRIV),' \ + -e 's,@GLUT_PC_LIB_PRIV@,$(GLUT_PC_LIB_PRIV),' \ + -e 's,@GLUT_PC_CFLAGS@,$(GLUT_PC_CFLAGS),' glut.pc: glut.pc.in $(pcedit) $< > $@ diff --git a/src/glut/mini/glut.pc.in b/src/glut/mini/glut.pc.in index e8638fe1488..ae0689d7e81 100644 --- a/src/glut/mini/glut.pc.in +++ b/src/glut/mini/glut.pc.in @@ -6,6 +6,8 @@ includedir=@INSTALL_INC_DIR@ Name: glut Description: Mesa OpenGL Utility Toolkit library Requires: gl glu +Requires.private: @GLUT_PC_REQ_PRIV@ Version: @VERSION@ Libs: -L${libdir} -lglut -Cflags: -I${includedir} +Libs.private: @GLUT_PC_LIB_PRIV@ +Cflags: -I${includedir} @GLUT_PC_CFLAGS@ |