diff options
| author | Tom Fogal <tfogal@alumni.unh.edu> | 2009-04-29 10:32:46 -0600 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-04-29 12:15:07 -0700 |
| commit | a9c97c5f2a9b880d01336a23134600e4b34429d0 (patch) | |
| tree | e9076fdd84cfbf34984ba493e3cc3dbeecc6eb5a /src/glw | |
| parent | 66f978625685d83b04c32b19b62c3cb8c0d25f74 (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>
Diffstat (limited to 'src/glw')
| -rw-r--r-- | src/glw/Makefile | 3 | ||||
| -rw-r--r-- | src/glw/glw.pc.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/glw/Makefile b/src/glw/Makefile index b153a6df75..d88d773313 100644 --- 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 5493093be1..19a7c307c0 100644 --- 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@ |