summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Fogal <tfogal@alumni.unh.edu>2009-04-29 10:32:46 -0600
committerDan Nicholson <dbn.lists@gmail.com>2009-04-29 12:15:07 -0700
commiteca2706e231d8e9b54eb8713116a9e01234b70ef (patch)
tree7599fca4662625cf4896f7743bd271f86e756f40
parent794171159dede6701a939362bed04157576d17f0 (diff)
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>
-rw-r--r--Makefile3
-rw-r--r--glw.pc.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b153a6d..d88d773 100644
--- a/Makefile
+++ b/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/glw.pc.in b/glw.pc.in
index 5493093..19a7c30 100644
--- a/glw.pc.in
+++ b/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@