summaryrefslogtreecommitdiff
path: root/src/glw
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2008-11-24 11:01:57 -0800
committerDan Nicholson <dbn.lists@gmail.com>2008-12-14 08:47:03 -0800
commit71e208bafe9ca5e1c189fae3f251cc84034e5959 (patch)
treed265a82d8f8d300f6b8e51e1db1eebf268910c8a /src/glw
parenta42342cd90c19d8c29093e91d07d7efab5b5d25a (diff)
Add more package metadata to the pkg-config files
The pkg-config files have been filled in more thoroughly to allow users to use mesa more effectively. By adding metadata to Requires.private, Libs.private and Cflags, we can ensure that all the libraries and headers will be found in all situations. However, the full substitutions are only done when using the configure script. This also fixes the glu pkg-config file to account for using GL or OSMesa. Fixes bug 18161.
Diffstat (limited to 'src/glw')
-rw-r--r--src/glw/Makefile5
-rw-r--r--src/glw/glw.pc.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 753c4b74d4..cf412b225e 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -30,7 +30,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@,$(MAJOR).$(MINOR).$(TINY),'
+ -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),'
glw.pc: glw.pc.in
$(pcedit) $< > $@
diff --git a/src/glw/glw.pc.in b/src/glw/glw.pc.in
index 25f3f73b8c..5493093be1 100644
--- a/src/glw/glw.pc.in
+++ b/src/glw/glw.pc.in
@@ -6,6 +6,8 @@ includedir=@INSTALL_INC_DIR@
Name: glw
Description: Mesa OpenGL widget library
Requires: gl
+Requires.private: @GLW_PC_REQ_PRIV@
Version: @VERSION@
Libs: -L${libdir} -lGLw
-Cflags: -I${includedir}
+Libs.private: @GLW_PC_LIB_PRIV@
+Cflags: -I${includedir} @GLW_PC_CFLAGS@