X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=43f7236c987bbd9d5390d2984e6dfca67fdf530a;hb=79e3227022ae3d66f9f3806d231fdeec2a06cc6b;hp=4a154a118f6799617631c9f87071ede925c1bf69;hpb=53971ea183d9d1dcfbaec18b135e49c9c118fabb;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/Makefile.am b/src/Makefile.am index 4a154a1..43f7236 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,6 +15,7 @@ lib_LTLIBRARIES = libXCB.la \ libXCBxf86dri.la \ libXCBxfixes.la \ libXCBxprint.la \ + libXCBxtest.la \ libXCBxv.la \ libXCBxvmc.la @@ -37,6 +38,7 @@ EXTHEADERS = \ extensions/xf86dri.h \ extensions/xfixes.h \ extensions/xprint.h \ + extensions/xtest.h \ extensions/xv.h \ extensions/xvmc.h EXTSOURCES = \ @@ -58,6 +60,7 @@ EXTSOURCES = \ extensions/xf86dri.c \ extensions/xfixes.c \ extensions/xprint.c \ + extensions/xtest.c \ extensions/xv.c \ extensions/xvmc.c EXTENSIONS = $(EXTSOURCES) $(EXTHEADERS) @@ -68,68 +71,140 @@ 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 +# The library supports interface (current-age) to interface current. +# * If you changed the source code at all, increment revision. +# * If you add an interface, increment current and age and set revision to 0. +# * If you change or remove an interface, increment current and set revision +# and age to 0. +libXCB_la_LDFLAGS = -version-info 0:0:0 BUILT_SOURCES = $(COREPROTO) $(EXTENSIONS) CLEANFILES = $(COREPROTO) $(EXTENSIONS) -clean-local: - rmdir extensions || true -XCB_LIBS = $(top_builddir)/src/libXCB.la +XCB_LIBS = libXCB.la + +# FIXME: find a way to autogenerate this from the XML files. +libXCBcomposite_la_LDFLAGS = -version-info 0:0:0 libXCBcomposite_la_LIBADD = $(XCB_LIBS) libXCBcomposite_la_SOURCES = extensions/composite.c extensions/composite.h + +libXCBdamage_la_LDFLAGS = -version-info 0:0:0 libXCBdamage_la_LIBADD = $(XCB_LIBS) libXCBdamage_la_SOURCES = extensions/damage.c extensions/damage.h + +libXCBdpms_la_LDFLAGS = -version-info 0:0:0 libXCBdpms_la_LIBADD = $(XCB_LIBS) libXCBdpms_la_SOURCES = extensions/dpms.c extensions/dpms.h + +libXCBglx_la_LDFLAGS = -version-info 0:0:0 libXCBglx_la_LIBADD = $(XCB_LIBS) libXCBglx_la_SOURCES = extensions/glx.c extensions/glx.h + +libXCBrandr_la_LDFLAGS = -version-info 0:0:0 libXCBrandr_la_LIBADD = $(XCB_LIBS) libXCBrandr_la_SOURCES = extensions/randr.c extensions/randr.h + +libXCBrecord_la_LDFLAGS = -version-info 0:0:0 libXCBrecord_la_LIBADD = $(XCB_LIBS) libXCBrecord_la_SOURCES = extensions/record.c extensions/record.h + +libXCBrender_la_LDFLAGS = -version-info 0:0:0 libXCBrender_la_LIBADD = $(XCB_LIBS) libXCBrender_la_SOURCES = extensions/render.c extensions/render.h + +libXCBres_la_LDFLAGS = -version-info 0:0:0 libXCBres_la_LIBADD = $(XCB_LIBS) libXCBres_la_SOURCES = extensions/res.c extensions/res.h + +libXCBscreensaver_la_LDFLAGS = -version-info 0:0:0 libXCBscreensaver_la_LIBADD = $(XCB_LIBS) libXCBscreensaver_la_SOURCES = extensions/screensaver.c extensions/screensaver.h + +libXCBshape_la_LDFLAGS = -version-info 0:0:0 libXCBshape_la_LIBADD = $(XCB_LIBS) libXCBshape_la_SOURCES = extensions/shape.c extensions/shape.h + +libXCBshm_la_LDFLAGS = -version-info 0:0:0 libXCBshm_la_LIBADD = $(XCB_LIBS) libXCBshm_la_SOURCES = extensions/shm.c extensions/shm.h + +libXCBsync_la_LDFLAGS = -version-info 0:0:0 libXCBsync_la_LIBADD = $(XCB_LIBS) libXCBsync_la_SOURCES = extensions/sync.c extensions/sync.h + +libXCBxevie_la_LDFLAGS = -version-info 0:0:0 libXCBxevie_la_LIBADD = $(XCB_LIBS) libXCBxevie_la_SOURCES = extensions/xevie.c extensions/xevie.h + +libXCBxf86dri_la_LDFLAGS = -version-info 0:0:0 libXCBxf86dri_la_LIBADD = $(XCB_LIBS) libXCBxf86dri_la_SOURCES = extensions/xf86dri.c extensions/xf86dri.h + +libXCBxfixes_la_LDFLAGS = -version-info 0:0:0 libXCBxfixes_la_LIBADD = $(XCB_LIBS) libXCBxfixes_la_SOURCES = extensions/xfixes.c extensions/xfixes.h + +libXCBxprint_la_LDFLAGS = -version-info 0:0:0 libXCBxprint_la_LIBADD = $(XCB_LIBS) libXCBxprint_la_SOURCES = extensions/xprint.c extensions/xprint.h + +libXCBxtest_la_LDFLAGS = -version-info 0:0:0 +libXCBxtest_la_LIBADD = $(XCB_LIBS) +libXCBxtest_la_SOURCES = extensions/xtest.c extensions/xtest.h + +libXCBxv_la_LDFLAGS = -version-info 0:0:0 libXCBxv_la_LIBADD = $(XCB_LIBS) libXCBxv_la_SOURCES = extensions/xv.c extensions/xv.h + +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)/ \ @@ -137,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