X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=43f7236c987bbd9d5390d2984e6dfca67fdf530a;hb=79e3227022ae3d66f9f3806d231fdeec2a06cc6b;hp=719190ae17441446ea86ed81ea673bd167b5e3f9;hpb=92456577dbbe3874d6e40a1ef26b63dd405c160c;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/Makefile.am b/src/Makefile.am
index 719190a..43f7236 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,20 +71,42 @@ 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)
 noinst_HEADERS = xcbint.h
 
-CFLAGS =
 AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
 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
@@ -97,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
 
@@ -180,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)/ \
@@ -190,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