Use variable library name in pkg-config output.

Previously the pkg-config output files would contain e.g. `-lGL'
and `-lGLU', even if the user modified their configuration to
build libraries with different names.  This modifies the
pkg-config inputs, and corresponding makery, so that modifying the
output library name will cause the appropriate updated name to
appear in the pkg-config `-l' option.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>

diff --git a/src/glu/Makefile b/src/glu/Makefile
index e519dfeec49488816572a07882956ca2b4e3d6fd..5c26ead1bb9b8208b3bdd7ff96153873d0547f5a 100644 (file)
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -22,7 +22,8 @@ pcedit = sed \
        -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),'
+       -e 's,@GLU_PC_CFLAGS@,$(GLU_PC_CFLAGS),' \
+       -e 's,@GLU_LIB@,$(GLU_LIB),'
 glu.pc: glu.pc.in
        $(pcedit) $< > $@
 

diff --git a/src/glu/glu.pc.in b/src/glu/glu.pc.in
index bc2517e90ed1102e2160160a612ec98fdc76bc32..f7d9109823253ac0d7c4f93bb523f2d8270f8287 100644 (file)
--- a/src/glu/glu.pc.in
+++ b/src/glu/glu.pc.in
@@ -8,6 +8,6 @@ Description: Mesa OpenGL Utility library
 Requires: @GLU_PC_REQ@
 Requires.private: @GLU_PC_REQ_PRIV@
 Version: @VERSION@
-Libs: -L${libdir} -lGLU
+Libs: -L${libdir} -l@GLU_LIB@
 Libs.private: @GLU_PC_LIB_PRIV@
 Cflags: -I${includedir} @GLU_PC_CFLAGS@

diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 9a975bbc60d2b7ffa095ef4e91ba21c5562a1a1a..1b072906c74111d3dea4777ba3d9c746b61f5d5c 100644 (file)
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -107,7 +107,8 @@ pcedit = sed \
        -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),'
+       -e 's,@GLUT_PC_CFLAGS@,$(GLUT_PC_CFLAGS),' \
+       -e 's,@GLUT_LIB@,$(GLUT_LIB),'
 glut.pc: glut.pc.in
        $(pcedit) $< > $@
 

diff --git a/src/glut/glx/glut.pc.in b/src/glut/glx/glut.pc.in
index ae0689d7e8165ef4940c41e671b8bc1c10be7244..151dd0b802b8368bce5b2eedb6b77c5e28fa2b9f 100644 (file)
--- a/src/glut/glx/glut.pc.in
+++ b/src/glut/glx/glut.pc.in
@@ -8,6 +8,6 @@ Description: Mesa OpenGL Utility Toolkit library
 Requires: gl glu
 Requires.private: @GLUT_PC_REQ_PRIV@
 Version: @VERSION@
-Libs: -L${libdir} -lglut
+Libs: -L${libdir} -l@GLUT_LIB@
 Libs.private: @GLUT_PC_LIB_PRIV@
 Cflags: -I${includedir} @GLUT_PC_CFLAGS@

diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index 841a473f891acb127a4076637ba5db08ae9b8d3e..0e42436133d97d8e928b13c3ff1cbbb49204d4bf 100644 (file)
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -81,7 +81,8 @@ pcedit = sed \
        -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),'
+       -e 's,@GLUT_PC_CFLAGS@,$(GLUT_PC_CFLAGS),' \
+       -e 's,@GLUT_LIB@,$(GLUT_LIB),'
 glut.pc: glut.pc.in
        $(pcedit) $< > $@
 

diff --git a/src/glut/mini/glut.pc.in b/src/glut/mini/glut.pc.in
index ae0689d7e8165ef4940c41e671b8bc1c10be7244..151dd0b802b8368bce5b2eedb6b77c5e28fa2b9f 100644 (file)
--- a/src/glut/mini/glut.pc.in
+++ b/src/glut/mini/glut.pc.in
@@ -8,6 +8,6 @@ Description: Mesa OpenGL Utility Toolkit library
 Requires: gl glu
 Requires.private: @GLUT_PC_REQ_PRIV@
 Version: @VERSION@
-Libs: -L${libdir} -lglut
+Libs: -L${libdir} -l@GLUT_LIB@
 Libs.private: @GLUT_PC_LIB_PRIV@
 Cflags: -I${includedir} @GLUT_PC_CFLAGS@

diff --git a/src/glw/Makefile b/src/glw/Makefile
index b153a6df751feb3115afc3b4fdd649a60c55c951..d88d7733131183fcd91386479eaae0d31d0d470d 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -33,7 +33,8 @@ pcedit = sed \
        -e 's,@VERSION@,$(MAJOR).$(MINOR).$(TINY),' \
        -e 's,@GLW_PC_REQ_PRIV@,$(GLW_PC_REQ_PRIV),' \
        -e 's,@GLW_PC_LIB_PRIV@,$(GLW_PC_LIB_PRIV),' \
-       -e 's,@GLW_PC_CFLAGS@,$(GLW_PC_CFLAGS),'
+       -e 's,@GLW_PC_CFLAGS@,$(GLW_PC_CFLAGS),' \
+       -e 's,@GLW_LIB@,$(GLW_LIB),'
 glw.pc: glw.pc.in
        $(pcedit) $< > $@
 

diff --git a/src/glw/glw.pc.in b/src/glw/glw.pc.in
index 5493093be19a134a2506a46a3a2bc1d6fd8e3898..19a7c307c016cfacfa065abff24a979a742ba2b5 100644 (file)
--- a/src/glw/glw.pc.in
+++ b/src/glw/glw.pc.in
@@ -8,6 +8,6 @@ Description: Mesa OpenGL widget library
 Requires: gl
 Requires.private: @GLW_PC_REQ_PRIV@
 Version: @VERSION@
-Libs: -L${libdir} -lGLw
+Libs: -L${libdir} -l@GLW_LIB@
 Libs.private: @GLW_PC_LIB_PRIV@
 Cflags: -I${includedir} @GLW_PC_CFLAGS@

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 4ff28dae9bbd2fcd8eeccc006b6e7ba2234d3249..bb18bee8eaf189f07d940f5cd4c0987ddf92e747 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -103,7 +103,8 @@ gl_pcedit = sed \
        -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
        -e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
        -e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
-       -e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),'
+       -e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
+       -e 's,@GL_LIB@,$(GL_LIB),'
 
 gl.pc: gl.pc.in
        $(gl_pcedit) $< > $@

diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
index 0462b9fca2b8572acd033d5fbeaf95a6dce6a2df..97b86596fcf49f33058d741d57f4248abc5de2e0 100644 (file)
--- a/src/mesa/gl.pc.in
+++ b/src/mesa/gl.pc.in
@@ -7,6 +7,6 @@ Name: gl
 Description: Mesa OpenGL library
 Requires.private: @GL_PC_REQ_PRIV@
 Version: @VERSION@
-Libs: -L${libdir} -lGL
+Libs: -L${libdir} -l@GL_LIB@
 Libs.private: @GL_PC_LIB_PRIV@
 Cflags: -I${includedir} @GL_PC_CFLAGS@