frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop installing the protocol descriptions for extensions to an extensions/ 

subdirectory
This commit is contained in:
Josh Triplett 2006-09-25 05:10:37 -07:00
parent 0d7beff580
commit f7cd80142f
4 changed files with 112 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/.gitignore vendored
View File

@ -1,6 +1,24 @@
xproto.xml
xproto.c
xproto.h
bigreq.*
composite.*
damage.*
dpms.*
glx.*
randr.*
record.*
render.*
res.*
screensaver.*
shape.*
shm.*
sync.*
xc_misc.*
xevie.*
xf86dri.*
xfixes.*
xprint.*
xtest.*
xv.*
xvmc.*
xproto.*
xcb_des.c
extensions
X11

179
src/Makefile.am
View File

@ -21,79 +21,79 @@ lib_LTLIBRARIES = libxcb.la \
libxcb-xvmc.la
EXTHEADERS = \
extensions/bigreq.h \
extensions/composite.h \
extensions/damage.h \
extensions/dpms.h \
extensions/glx.h \
extensions/randr.h \
extensions/record.h \
extensions/render.h \
extensions/res.h \
extensions/screensaver.h \
extensions/shape.h \
extensions/shm.h \
extensions/sync.h \
extensions/xc_misc.h \
extensions/xevie.h \
extensions/xf86dri.h \
extensions/xfixes.h \
extensions/xprint.h \
extensions/xtest.h \
extensions/xv.h \
extensions/xvmc.h
bigreq.h \
composite.h \
damage.h \
dpms.h \
glx.h \
randr.h \
record.h \
render.h \
res.h \
screensaver.h \
shape.h \
shm.h \
sync.h \
xc_misc.h \
xevie.h \
xf86dri.h \
xfixes.h \
xprint.h \
xtest.h \
xv.h \
xvmc.h
EXTSOURCES = \
extensions/bigreq.c \
extensions/composite.c \
extensions/damage.c \
extensions/dpms.c \
extensions/glx.c \
extensions/randr.c \
extensions/record.c \
extensions/render.c \
extensions/res.c \
extensions/screensaver.c \
extensions/shape.c \
extensions/shm.c \
extensions/sync.c \
extensions/xc_misc.c \
extensions/xevie.c \
extensions/xf86dri.c \
extensions/xfixes.c \
extensions/xprint.c \
extensions/xtest.c \
extensions/xv.c \
extensions/xvmc.c
bigreq.c \
composite.c \
damage.c \
dpms.c \
glx.c \
randr.c \
record.c \
render.c \
res.c \
screensaver.c \
shape.c \
shm.c \
sync.c \
xc_misc.c \
xevie.c \
xf86dri.c \
xfixes.c \
xprint.c \
xtest.c \
xv.c \
xvmc.c
EXTENSIONS = $(EXTSOURCES) $(EXTHEADERS)
ESSENTIAL_EXTENSIONS = \
extensions/bigreq.h \
extensions/bigreq.c \
extensions/xc_misc.h \
extensions/xc_misc.c
bigreq.h \
bigreq.c \
xc_misc.h \
xc_misc.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
bigreq.xml \
composite.xml \
damage.xml \
dpms.xml \
glx.xml \
randr.xml \
record.xml \
render.xml \
res.xml \
screensaver.xml \
shape.xml \
shm.xml \
sync.xml \
xc_misc.xml \
xevie.xml \
xf86dri.xml \
xfixes.xml \
xprint.xml \
xtest.xml \
xvmc.xml \
xv.xml
COREHEADERS = xproto.h
CORESOURCES = xproto.c
@ -131,79 +131,79 @@ libxcb_xlib_la_SOURCES = xcb_xlib.c
libxcb_composite_la_LDFLAGS = -version-info 0:0:0
libxcb_composite_la_LIBADD = $(XCB_LIBS)
libxcb_composite_la_SOURCES = extensions/composite.c extensions/composite.h
libxcb_composite_la_SOURCES = composite.c composite.h
libxcb_damage_la_LDFLAGS = -version-info 0:0:0
libxcb_damage_la_LIBADD = $(XCB_LIBS)
libxcb_damage_la_SOURCES = extensions/damage.c extensions/damage.h
libxcb_damage_la_SOURCES = damage.c damage.h
libxcb_dpms_la_LDFLAGS = -version-info 0:0:0
libxcb_dpms_la_LIBADD = $(XCB_LIBS)
libxcb_dpms_la_SOURCES = extensions/dpms.c extensions/dpms.h
libxcb_dpms_la_SOURCES = dpms.c dpms.h
libxcb_glx_la_LDFLAGS = -version-info 0:0:0
libxcb_glx_la_LIBADD = $(XCB_LIBS)
libxcb_glx_la_SOURCES = extensions/glx.c extensions/glx.h
libxcb_glx_la_SOURCES = glx.c glx.h
libxcb_randr_la_LDFLAGS = -version-info 0:0:0
libxcb_randr_la_LIBADD = $(XCB_LIBS)
libxcb_randr_la_SOURCES = extensions/randr.c extensions/randr.h
libxcb_randr_la_SOURCES = randr.c randr.h
libxcb_record_la_LDFLAGS = -version-info 0:0:0
libxcb_record_la_LIBADD = $(XCB_LIBS)
libxcb_record_la_SOURCES = extensions/record.c extensions/record.h
libxcb_record_la_SOURCES = record.c record.h
libxcb_render_la_LDFLAGS = -version-info 0:0:0
libxcb_render_la_LIBADD = $(XCB_LIBS)
libxcb_render_la_SOURCES = extensions/render.c extensions/render.h
libxcb_render_la_SOURCES = render.c render.h
libxcb_res_la_LDFLAGS = -version-info 0:0:0
libxcb_res_la_LIBADD = $(XCB_LIBS)
libxcb_res_la_SOURCES = extensions/res.c extensions/res.h
libxcb_res_la_SOURCES = res.c res.h
libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0
libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
libxcb_screensaver_la_SOURCES = extensions/screensaver.c extensions/screensaver.h
libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
libxcb_shape_la_LDFLAGS = -version-info 0:0:0
libxcb_shape_la_LIBADD = $(XCB_LIBS)
libxcb_shape_la_SOURCES = extensions/shape.c extensions/shape.h
libxcb_shape_la_SOURCES = shape.c shape.h
libxcb_shm_la_LDFLAGS = -version-info 0:0:0
libxcb_shm_la_LIBADD = $(XCB_LIBS)
libxcb_shm_la_SOURCES = extensions/shm.c extensions/shm.h
libxcb_shm_la_SOURCES = shm.c shm.h
libxcb_sync_la_LDFLAGS = -version-info 0:0:0
libxcb_sync_la_LIBADD = $(XCB_LIBS)
libxcb_sync_la_SOURCES = extensions/sync.c extensions/sync.h
libxcb_sync_la_SOURCES = sync.c sync.h
libxcb_xevie_la_LDFLAGS = -version-info 0:0:0
libxcb_xevie_la_LIBADD = $(XCB_LIBS)
libxcb_xevie_la_SOURCES = extensions/xevie.c extensions/xevie.h
libxcb_xevie_la_SOURCES = xevie.c xevie.h
libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0
libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
libxcb_xf86dri_la_SOURCES = extensions/xf86dri.c extensions/xf86dri.h
libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0
libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
libxcb_xfixes_la_SOURCES = extensions/xfixes.c extensions/xfixes.h
libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
libxcb_xprint_la_LDFLAGS = -version-info 0:0:0
libxcb_xprint_la_LIBADD = $(XCB_LIBS)
libxcb_xprint_la_SOURCES = extensions/xprint.c extensions/xprint.h
libxcb_xprint_la_SOURCES = xprint.c xprint.h
libxcb_xtest_la_LDFLAGS = -version-info 0:0:0
libxcb_xtest_la_LIBADD = $(XCB_LIBS)
libxcb_xtest_la_SOURCES = extensions/xtest.c extensions/xtest.h
libxcb_xtest_la_SOURCES = xtest.c xtest.h
libxcb_xv_la_LDFLAGS = -version-info 0:0:0
libxcb_xv_la_LIBADD = $(XCB_LIBS)
libxcb_xv_la_SOURCES = extensions/xv.c extensions/xv.h
libxcb_xv_la_SOURCES = xv.c xv.h
libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0
libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
libxcb_xvmc_la_SOURCES = extensions/xvmc.c extensions/xvmc.h
libxcb_xvmc_la_SOURCES = xvmc.c xvmc.h
$(EXTHEADERS) $(EXTSOURCES): c-client.xsl
@ -213,23 +213,20 @@ SUFFIXES = .xml
@n=`dirname $*`; test -d $$n || (echo mkdir $$n; mkdir $$n)
$(XSLTPROC) --stringparam mode header \
--stringparam base-path $(XCBPROTO_XCBINCLUDEDIR)/ \
--stringparam extension-path \
$(XCBPROTO_XCBINCLUDEDIR)/extensions/ \
--stringparam extension-path $(XCBPROTO_XCBINCLUDEDIR)/ \
-o $@ $(srcdir)/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/ \
--stringparam extension-path $(XCBPROTO_XCBINCLUDEDIR)/ \
-o $@ $(srcdir)/c-client.xsl $<
xproto.xml: $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml
$(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml $@
$(EXTENSION_XML):
[ -d extensions ] || mkdir extensions
for i in $(EXTENSION_XML) ; do \
rm -f $$i ; \
$(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/$$i $$i ; \

2
src/xcb_out.c
View File

@ -33,7 +33,7 @@
#include "xcb.h"
#include "xcbext.h"
#include "xcbint.h"
#include "extensions/bigreq.h"
#include "bigreq.h"
static int write_block(xcb_connection_t *c, struct iovec *vector, int count)
{

2
src/xcb_xid.c
View File

@ -29,7 +29,7 @@
#include "xcb.h"
#include "xcbext.h"
#include "xcbint.h"
#include "extensions/xc_misc.h"
#include "xc_misc.h"
/* Public interface */