summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-11-19 07:15:42 +0000
committerKevin E Martin <kem@kem.org>2005-11-19 07:15:42 +0000
commit5a807bcce047a8072db2c0cef05a84aa6e6cd3ca (patch)
treea6aa0b4e9aa0b3e0510dade14859d4278ce37440
parentc50ca633b633d25ba672fb19ac182cea40242069 (diff)
downloadxorg-lib-libXmu-5a807bcce047a8072db2c0cef05a84aa6e6cd3ca.tar.gz
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work with separate build roots.
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac2
-rw-r--r--xmu.pc.in6
-rw-r--r--xmuu.pc.in6
4 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 615e384..3dd92a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * xmu.pc.in:
+ * xmuu.pc.in:
+ Update pkgconfig files to separate library build-time dependencies
+ from application build-time dependencies.
+ * configure.ac:
+ Update dependencies to work with separate build roots.
+
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 5ff75ee..345e5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_PROG_LIBTOOL
AC_PROG_CC
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XMU, xt xext)
+PKG_CHECK_MODULES(XMU, xt xext xextproto)
AC_SUBST(XMU_CFLAGS)
AC_SUBST(XMU_LIBS)
diff --git a/xmu.pc.in b/xmu.pc.in
index a504827..a086f83 100644
--- a/xmu.pc.in
+++ b/xmu.pc.in
@@ -6,5 +6,7 @@ includedir=@includedir@
Name: Xmu
Description: Xmu Library
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXmu @XMU_LIBS@
-Cflags: -I${includedir} @XMU_CFLAGS@
+Requires: xproto x11 xt
+Requires.private: x11 xt xext
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXmu
diff --git a/xmuu.pc.in b/xmuu.pc.in
index 46f5b9f..1e91ac4 100644
--- a/xmuu.pc.in
+++ b/xmuu.pc.in
@@ -6,5 +6,7 @@ includedir=@includedir@
Name: Xmuu
Description: Mini Xmu Library
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lXmuu @XMUU_LIBS@
-Cflags: -I${includedir} @XMUU_CFLAGS@
+Requires: xproto x11
+Requires.private: x11
+Cflags: -I${includedir}
+Libs: -L${libdir} -lXmuu