X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=2475b6e609d589edf8d35862eb539aaa5625560d;hb=912cd97a6dd019e9e7ecf09c82c4577dd2ad7529;hp=440e9a879c56b81d8a2a608a5627e6502f4f1fcf;hpb=7a74ba3d0212f9bfe021d6da9070f71cbc53f85b;p=free-sw%2Fxcb%2Flibxcb

diff --git a/Makefile.am b/Makefile.am
index 440e9a8..2475b6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
-SUBDIRS=src tests doc
+ACLOCAL_AMFLAGS=-I m4
+
+SUBDIRS=src tests doc man
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-pkgconfig_DATA = \
-xcb.pc \
-xcb-xlib.pc
+pkgconfig_DATA = xcb.pc
 
 if BUILD_COMPOSITE
 pkgconfig_DATA += xcb-composite.pc
@@ -15,9 +15,18 @@ endif
 if BUILD_DPMS
 pkgconfig_DATA += xcb-dpms.pc
 endif
+if BUILD_DRI2
+pkgconfig_DATA += xcb-dri2.pc
+endif
+if BUILD_DRI3
+pkgconfig_DATA += xcb-dri3.pc
+endif
 if BUILD_GLX
 pkgconfig_DATA += xcb-glx.pc
 endif
+if BUILD_PRESENT
+pkgconfig_DATA += xcb-present.pc
+endif
 if BUILD_RANDR
 pkgconfig_DATA += xcb-randr.pc
 endif
@@ -27,7 +36,7 @@ endif
 if BUILD_RENDER
 pkgconfig_DATA += xcb-render.pc
 endif
-if BUILD_RES
+if BUILD_RESOURCE
 pkgconfig_DATA += xcb-res.pc
 endif
 if BUILD_SCREENSAVER
@@ -45,7 +54,7 @@ endif
 if BUILD_XEVIE
 pkgconfig_DATA += xcb-xevie.pc
 endif
-if BUILD_XF86DRI
+if BUILD_XFREE86_DRI
 pkgconfig_DATA += xcb-xf86dri.pc
 endif
 if BUILD_XFIXES
@@ -54,9 +63,18 @@ endif
 if BUILD_XINERAMA
 pkgconfig_DATA += xcb-xinerama.pc
 endif
+if BUILD_XINPUT
+pkgconfig_DATA += xcb-xinput.pc
+endif
+if BUILD_XKB
+pkgconfig_DATA += xcb-xkb.pc
+endif
 if BUILD_XPRINT
 pkgconfig_DATA += xcb-xprint.pc
 endif
+if BUILD_SELINUX
+pkgconfig_DATA += xcb-xselinux.pc
+endif
 if BUILD_XTEST
 pkgconfig_DATA += xcb-xtest.pc
 endif
@@ -68,73 +86,26 @@ pkgconfig_DATA += xcb-xvmc.pc
 endif
 
 
+AM_TESTS_ENVIRONMENT = \
+	AM_SRCDIR=${srcdir}
+
+TESTS=check-pc-requires
+
 EXTRA_DIST = \
-xcb.pc.in \
-xcb-xlib.pc.in \
 tools/README \
 tools/api_conv.pl \
 tools/constants \
-autogen.sh
+autogen.sh \
+$(TESTS)
 
-if BUILD_COMPOSITE
-EXTRA_DIST += xcb-composite.pc.in
-endif
-if BUILD_DAMAGE
-EXTRA_DIST += xcb-damage.pc.in
-endif
-if BUILD_DPMS
-EXTRA_DIST += xcb-dpms.pc.in
-endif
-if BUILD_GLX
-EXTRA_DIST += xcb-glx.pc.in
-endif
-if BUILD_RANDR
-EXTRA_DIST += xcb-randr.pc.in
-endif
-if BUILD_RECORD
-EXTRA_DIST += xcb-record.pc.in
-endif
-if BUILD_RENDER
-EXTRA_DIST += xcb-render.pc.in
-endif
-if BUILD_RES
-EXTRA_DIST += xcb-res.pc.in
-endif
-if BUILD_SCREENSAVER
-EXTRA_DIST += xcb-screensaver.pc.in
-endif
-if BUILD_SHAPE
-EXTRA_DIST += xcb-shape.pc.in
-endif
-if BUILD_SHM
-EXTRA_DIST += xcb-shm.pc.in
-endif
-if BUILD_SYNC
-EXTRA_DIST += xcb-sync.pc.in
-endif
-if BUILD_XEVIE
-EXTRA_DIST += xcb-xevie.pc.in
-endif
-if BUILD_XF86DRI
-EXTRA_DIST += xcb-xf86dri.pc.in
-endif
-if BUILD_XFIXES
-EXTRA_DIST += xcb-xfixes.pc.in
-endif
-if BUILD_XINERAMA
-EXTRA_DIST += xcb-xinerama.pc.in
-endif
-if BUILD_XPRINT
-EXTRA_DIST += xcb-xprint.pc.in
-endif
-if BUILD_XTEST
-EXTRA_DIST += xcb-xtest.pc.in
-endif
-if BUILD_XV
-EXTRA_DIST += xcb-xv.pc.in
-endif
-if BUILD_XVMC
-EXTRA_DIST += xcb-xvmc.pc.in
-endif
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
 
+ChangeLog:
+	$(CHANGELOG_CMD)
 
+dist-hook: ChangeLog INSTALL