Provide a "has error" property for XCBConnection.

[free-sw/xcb/libxcb] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0f59719..43f7236 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,8 +71,31 @@ ESSENTIAL_EXTENSIONS = \
                extensions/xc_misc.h \
                extensions/xc_misc.c
 
-COREHEADERS = xproto.h xcb_types.h
-CORESOURCES = xproto.c xcb_types.c
+EXTENSION_XML = \
+               extensions/bigreq.xml \
+               extensions/composite.xml \
+               extensions/damage.xml \
+               extensions/dpms.xml \
+               extensions/glx.xml \
+               extensions/randr.xml \
+               extensions/record.xml \
+               extensions/render.xml \
+               extensions/res.xml \
+               extensions/screensaver.xml \
+               extensions/shape.xml \
+               extensions/shm.xml \
+               extensions/sync.xml \
+               extensions/xc_misc.xml \
+               extensions/xevie.xml \
+               extensions/xf86dri.xml \
+               extensions/xfixes.xml \
+               extensions/xprint.xml \
+               extensions/xtest.xml \
+               extensions/xvmc.xml \
+               extensions/xv.xml
+
+COREHEADERS = xproto.h
+CORESOURCES = xproto.c
 COREPROTO   = $(CORESOURCES) $(COREHEADERS)
 
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
@@ -83,7 +106,7 @@ libXCB_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
 libXCB_la_SOURCES = \
                xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
                xcb_list.c xcb_util.c xcb_xlib.c xcb_auth.c \
-               $(COREPROTO) $(ESSENTIAL_EXTENSIONS)
+               $(COREPROTO) $(ESSENTIAL_EXTENSIONS) c-client.xsl
 
 # Explanation for -version-info:
 # -version-info current:revision:age
@@ -96,8 +119,6 @@ libXCB_la_LDFLAGS = -version-info 0:0:0
 
 BUILT_SOURCES = $(COREPROTO) $(EXTENSIONS)
 CLEANFILES = $(COREPROTO) $(EXTENSIONS)
-clean-local:
-       rmdir extensions || true
 
 XCB_LIBS = libXCB.la
 
@@ -179,9 +200,11 @@ libXCBxvmc_la_LDFLAGS = -version-info 0:0:0
 libXCBxvmc_la_LIBADD = $(XCB_LIBS)
 libXCBxvmc_la_SOURCES = extensions/xvmc.c extensions/xvmc.h
 
-vpath %.xml $(XCBPROTO_XCBINCLUDEDIR) $(XCBPROTO_XCBINCLUDEDIR)/extensions
+$(EXTHEADERS) $(EXTSOURCES): c-client.xsl
 
-%.h: %.xml c-client.xsl
+SUFFIXES = .xml
+
+.xml.h:
        @n=`dirname $*`; test -d $$n || (echo mkdir $$n; mkdir $$n)
        $(XSLTPROC) --stringparam mode header \
                    --stringparam base-path $(XCBPROTO_XCBINCLUDEDIR)/ \
@@ -189,10 +212,20 @@ vpath %.xml $(XCBPROTO_XCBINCLUDEDIR) $(XCBPROTO_XCBINCLUDEDIR)/extensions
                                  $(XCBPROTO_XCBINCLUDEDIR)/extensions/ \
                    -o $@ $(srcdir)/c-client.xsl $< 
 
-%.c: %.xml c-client.xsl
+.xml.c:
        @n=`dirname $*`; test -d $$n || (echo mkdir $$n; mkdir $$n)
        $(XSLTPROC) --stringparam mode source \
                    --stringparam base-path $(XCBPROTO_XCBINCLUDEDIR)/ \
                    --stringparam extension-path \
                                  $(XCBPROTO_XCBINCLUDEDIR)/extensions/ \
                    -o $@ $(srcdir)/c-client.xsl $< 
+
+xproto.xml: $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml
+       $(LN_S) $< $@
+
+$(EXTENSION_XML):
+       [ -d extensions ] || mkdir extensions
+       for i in $(EXTENSION_XML) ; do \
+           rm -f $$i ; \
+           $(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/$$i $$i ; \
+        done