Add .pc.in files for all the new extension libraries. Generate .pc files from the...

Based on a patch by Vincent Torri.  Changes from that patch: add Requires to the .pc.in files based on the <import>s in the extensions, add a .pc.in file for libXCBxtest, change Name and Description fields to match extension names.

diff --git a/Makefile.am b/Makefile.am
index df93163..53b1585 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,47 @@
 SUBDIRS=src tests
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xcb.pc
 
-EXTRA_DIST=xcb.pc.in
+pkgconfig_DATA = \
+xcb.pc \
+xcb-composite.pc \
+xcb-damage.pc \
+xcb-dpms.pc \
+xcb-glx.pc \
+xcb-randr.pc \
+xcb-record.pc \
+xcb-render.pc \
+xcb-res.pc \
+xcb-screensaver.pc \
+xcb-shape.pc \
+xcb-shm.pc \
+xcb-sync.pc \
+xcb-xevie.pc \
+xcb-xfree86dri.pc \
+xcb-xfixes.pc \
+xcb-xprint.pc \
+xcb-xtest.pc \
+xcb-xv.pc \
+xcb-xvmc.pc
+
+EXTRA_DIST = \
+xcb.pc.in \
+xcb-composite.pc.in \
+xcb-damage.pc.in \
+xcb-dpms.pc.in \
+xcb-glx.pc.in \
+xcb-randr.pc.in \
+xcb-record.pc.in \
+xcb-render.pc.in \
+xcb-res.pc.in \
+xcb-screensaver.pc.in \
+xcb-shape.pc.in \
+xcb-shm.pc.in \
+xcb-sync.pc.in \
+xcb-xevie.pc.in \
+xcb-xfree86dri.pc.in \
+xcb-xfixes.pc.in \
+xcb-xprint.pc.in \
+xcb-xtest.pc.in \
+xcb-xv.pc.in \
+xcb-xvmc.pc.in

diff --git a/configure.ac b/configure.ac
index ccd549a..108b07f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,6 @@ AC_SUBST(CWARNFLAGS)
 GCC_CHECK_VISIBILITY()
 
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
-AC_CONFIG_FILES([xcb.pc])
+AC_CONFIG_FILES([xcb.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xfree86dri.pc xcb-xfixes.pc xcb-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc])
 
 AC_OUTPUT

diff --git a/xcb-composite.pc.in b/xcb-composite.pc.in
new file mode 100644 (file)
index 0000000..be04e12
--- /dev/null
+++ b/xcb-composite.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Composite
+Description: XCB Composite Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb xcb-xfixes
+Libs: -L${libdir} -lXCBcomposite
+Cflags: -I${includedir}

diff --git a/xcb-damage.pc.in b/xcb-damage.pc.in
new file mode 100644 (file)
index 0000000..2c4fbf1
--- /dev/null
+++ b/xcb-damage.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Damage
+Description: XCB Damage Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb xcb-xfixes
+Libs: -L${libdir} -lXCBdamage
+Cflags: -I${includedir}

diff --git a/xcb-dpms.pc.in b/xcb-dpms.pc.in
new file mode 100644 (file)
index 0000000..1940d73
--- /dev/null
+++ b/xcb-dpms.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB DPMS
+Description: XCB DPMS Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBdpms
+Cflags: -I${includedir}

diff --git a/xcb-glx.pc.in b/xcb-glx.pc.in
new file mode 100644 (file)
index 0000000..8151fb9
--- /dev/null
+++ b/xcb-glx.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB GLX
+Description: XCB GLX Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBglx
+Cflags: -I${includedir}

diff --git a/xcb-randr.pc.in b/xcb-randr.pc.in
new file mode 100644 (file)
index 0000000..b9f01b0
--- /dev/null
+++ b/xcb-randr.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB RandR
+Description: XCB RandR Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBrandr
+Cflags: -I${includedir}

diff --git a/xcb-record.pc.in b/xcb-record.pc.in
new file mode 100644 (file)
index 0000000..c7d3ac6
--- /dev/null
+++ b/xcb-record.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Record
+Description: XCB Record Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBrecord
+Cflags: -I${includedir}

diff --git a/xcb-render.pc.in b/xcb-render.pc.in
new file mode 100644 (file)
index 0000000..5f78bbf
--- /dev/null
+++ b/xcb-render.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Render
+Description: XCB Render Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBrender
+Cflags: -I${includedir}

diff --git a/xcb-res.pc.in b/xcb-res.pc.in
new file mode 100644 (file)
index 0000000..96e668c
--- /dev/null
+++ b/xcb-res.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Res
+Description: XCB X-Resource Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBres
+Cflags: -I${includedir}

diff --git a/xcb-screensaver.pc.in b/xcb-screensaver.pc.in
new file mode 100644 (file)
index 0000000..a24f49e
--- /dev/null
+++ b/xcb-screensaver.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Screensaver
+Description: XCB Screensaver Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBscreensaver
+Cflags: -I${includedir}

diff --git a/xcb-shape.pc.in b/xcb-shape.pc.in
new file mode 100644 (file)
index 0000000..f3f5c54
--- /dev/null
+++ b/xcb-shape.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Shape
+Description: XCB Shape Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBshape
+Cflags: -I${includedir}

diff --git a/xcb-shm.pc.in b/xcb-shm.pc.in
new file mode 100644 (file)
index 0000000..5b01ba6
--- /dev/null
+++ b/xcb-shm.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Shm
+Description: XCB Shm Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBshm
+Cflags: -I${includedir}

diff --git a/xcb-sync.pc.in b/xcb-sync.pc.in
new file mode 100644 (file)
index 0000000..e59c969
--- /dev/null
+++ b/xcb-sync.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Sync
+Description: XCB Sync Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBsync
+Cflags: -I${includedir}

diff --git a/xcb-xevie.pc.in b/xcb-xevie.pc.in
new file mode 100644 (file)
index 0000000..4062f19
--- /dev/null
+++ b/xcb-xevie.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Xevie
+Description: XCB Xevie Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBxevie
+Cflags: -I${includedir}

diff --git a/xcb-xfixes.pc.in b/xcb-xfixes.pc.in
new file mode 100644 (file)
index 0000000..c0e3fb6
--- /dev/null
+++ b/xcb-xfixes.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB XFixes
+Description: XCB XFixes Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb xcb-render xcb-shape
+Libs: -L${libdir} -lXCBxfixes
+Cflags: -I${includedir}

diff --git a/xcb-xfree86dri.pc.in b/xcb-xfree86dri.pc.in
new file mode 100644 (file)
index 0000000..1d37214
--- /dev/null
+++ b/xcb-xfree86dri.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB XFree86-DRI
+Description: XCB XFree86-DRI Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBxfree86dri
+Cflags: -I${includedir}

diff --git a/xcb-xprint.pc.in b/xcb-xprint.pc.in
new file mode 100644 (file)
index 0000000..90257a2
--- /dev/null
+++ b/xcb-xprint.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Xprint
+Description: XCB Xprint Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBxprint
+Cflags: -I${includedir}

diff --git a/xcb-xtest.pc.in b/xcb-xtest.pc.in
new file mode 100644 (file)
index 0000000..598b4d3
--- /dev/null
+++ b/xcb-xtest.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB XTEST
+Description: XCB XTEST Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lXCBxtest
+Cflags: -I${includedir}

diff --git a/xcb-xv.pc.in b/xcb-xv.pc.in
new file mode 100644 (file)
index 0000000..d23d56d
--- /dev/null
+++ b/xcb-xv.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB Xv
+Description: XCB Xv Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb xcb-shm
+Libs: -L${libdir} -lXCBxv
+Cflags: -I${includedir}

diff --git a/xcb-xvmc.pc.in b/xcb-xvmc.pc.in
new file mode 100644 (file)
index 0000000..37ec672
--- /dev/null
+++ b/xcb-xvmc.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB XvMC
+Description: XCB XvMC Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb xcb-xv
+Libs: -L${libdir} -lXCBxvmc
+Cflags: -I${includedir}