branch: externals/xelb commit 46211603089002521c0474ce5e35087c24f6147a Author: Chris Feng <chris.w.f...@gmail.com> Commit: Chris Feng <chris.w.f...@gmail.com>
Move generated libraries to lib/ --- el_client.el | 1 + Makefile => lib/Makefile | 10 ++++------ xcb-bigreq.el => lib/xcb-bigreq.el | 0 xcb-composite.el => lib/xcb-composite.el | 0 xcb-damage.el => lib/xcb-damage.el | 0 xcb-dpms.el => lib/xcb-dpms.el | 0 xcb-dri2.el => lib/xcb-dri2.el | 0 xcb-dri3.el => lib/xcb-dri3.el | 0 xcb-ge.el => lib/xcb-ge.el | 0 xcb-glx.el => lib/xcb-glx.el | 0 xcb-present.el => lib/xcb-present.el | 0 xcb-randr.el => lib/xcb-randr.el | 0 xcb-record.el => lib/xcb-record.el | 0 xcb-render.el => lib/xcb-render.el | 0 xcb-res.el => lib/xcb-res.el | 0 xcb-screensaver.el => lib/xcb-screensaver.el | 0 xcb-shape.el => lib/xcb-shape.el | 0 xcb-shm.el => lib/xcb-shm.el | 0 xcb-sync.el => lib/xcb-sync.el | 0 xcb-xc_misc.el => lib/xcb-xc_misc.el | 0 xcb-xevie.el => lib/xcb-xevie.el | 0 xcb-xf86dri.el => lib/xcb-xf86dri.el | 0 xcb-xf86vidmode.el => lib/xcb-xf86vidmode.el | 0 xcb-xfixes.el => lib/xcb-xfixes.el | 0 xcb-xinerama.el => lib/xcb-xinerama.el | 0 xcb-xinput.el => lib/xcb-xinput.el | 0 xcb-xkb.el => lib/xcb-xkb.el | 0 xcb-xprint.el => lib/xcb-xprint.el | 0 xcb-xproto.el => lib/xcb-xproto.el | 0 xcb-xselinux.el => lib/xcb-xselinux.el | 0 xcb-xtest.el => lib/xcb-xtest.el | 0 xcb-xv.el => lib/xcb-xv.el | 0 xcb-xvmc.el => lib/xcb-xvmc.el | 0 33 files changed, 5 insertions(+), 6 deletions(-) diff --git a/el_client.el b/el_client.el index b464607..a66f9d1 100644 --- a/el_client.el +++ b/el_client.el @@ -569,6 +569,7 @@ KeymapNotify event; instead, we handle this case in `xcb:unmarshal'." (if (not argv) (error "Usage: el_client.el <protocol.xml> [additional_load_paths]") (add-to-list 'load-path default-directory) + (add-to-list 'load-path (concat default-directory "/../")) (dolist (i (cdr argv)) (add-to-list 'load-path i)) (require 'xcb-types) diff --git a/Makefile b/lib/Makefile similarity index 75% rename from Makefile rename to lib/Makefile index efa17da..3bd2e7e 100644 --- a/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -PROTO_PATH := ../xcb-proto/src +PROTO_PATH := ../../xcb-proto/src EMACS_BIN := emacs -Q @@ -10,18 +10,16 @@ LIBS = xcb-xproto.el $(addprefix xcb-,$(addsuffix .el,$(EXTENSIONS))) all: clean $(LIBS) -xcb-%.el: $(PROTO_PATH)/%.xml +xcb-%.el: $(PROTO_PATH)/%.xml xcb-xproto.el @echo -n "\n"Generating $@... - @$(EMACS_BIN) --script ./el_client.el $< > $@ + @$(EMACS_BIN) --script ../el_client.el $< > $@ xcb-composite.el: xcb-xfixes.el xcb-damage.el: xcb-xfixes.el xcb-xvmc.el: xcb-xv.el xcb-randr.el: xcb-render.el xcb-xfixes.el: xcb-render.el xcb-shape.el -xcb-present.el: xcb-randr.el -xcb-present.el: xcb-xfixes.el -xcb-present.el: xcb-sync.el +xcb-present.el: xcb-randr.el xcb-xfixes.el xcb-sync.el xcb-xv.el: xcb-shm.el xcb-xinput.el: xcb-xfixes.el diff --git a/xcb-bigreq.el b/lib/xcb-bigreq.el similarity index 100% rename from xcb-bigreq.el rename to lib/xcb-bigreq.el diff --git a/xcb-composite.el b/lib/xcb-composite.el similarity index 100% rename from xcb-composite.el rename to lib/xcb-composite.el diff --git a/xcb-damage.el b/lib/xcb-damage.el similarity index 100% rename from xcb-damage.el rename to lib/xcb-damage.el diff --git a/xcb-dpms.el b/lib/xcb-dpms.el similarity index 100% rename from xcb-dpms.el rename to lib/xcb-dpms.el diff --git a/xcb-dri2.el b/lib/xcb-dri2.el similarity index 100% rename from xcb-dri2.el rename to lib/xcb-dri2.el diff --git a/xcb-dri3.el b/lib/xcb-dri3.el similarity index 100% rename from xcb-dri3.el rename to lib/xcb-dri3.el diff --git a/xcb-ge.el b/lib/xcb-ge.el similarity index 100% rename from xcb-ge.el rename to lib/xcb-ge.el diff --git a/xcb-glx.el b/lib/xcb-glx.el similarity index 100% rename from xcb-glx.el rename to lib/xcb-glx.el diff --git a/xcb-present.el b/lib/xcb-present.el similarity index 100% rename from xcb-present.el rename to lib/xcb-present.el diff --git a/xcb-randr.el b/lib/xcb-randr.el similarity index 100% rename from xcb-randr.el rename to lib/xcb-randr.el diff --git a/xcb-record.el b/lib/xcb-record.el similarity index 100% rename from xcb-record.el rename to lib/xcb-record.el diff --git a/xcb-render.el b/lib/xcb-render.el similarity index 100% rename from xcb-render.el rename to lib/xcb-render.el diff --git a/xcb-res.el b/lib/xcb-res.el similarity index 100% rename from xcb-res.el rename to lib/xcb-res.el diff --git a/xcb-screensaver.el b/lib/xcb-screensaver.el similarity index 100% rename from xcb-screensaver.el rename to lib/xcb-screensaver.el diff --git a/xcb-shape.el b/lib/xcb-shape.el similarity index 100% rename from xcb-shape.el rename to lib/xcb-shape.el diff --git a/xcb-shm.el b/lib/xcb-shm.el similarity index 100% rename from xcb-shm.el rename to lib/xcb-shm.el diff --git a/xcb-sync.el b/lib/xcb-sync.el similarity index 100% rename from xcb-sync.el rename to lib/xcb-sync.el diff --git a/xcb-xc_misc.el b/lib/xcb-xc_misc.el similarity index 100% rename from xcb-xc_misc.el rename to lib/xcb-xc_misc.el diff --git a/xcb-xevie.el b/lib/xcb-xevie.el similarity index 100% rename from xcb-xevie.el rename to lib/xcb-xevie.el diff --git a/xcb-xf86dri.el b/lib/xcb-xf86dri.el similarity index 100% rename from xcb-xf86dri.el rename to lib/xcb-xf86dri.el diff --git a/xcb-xf86vidmode.el b/lib/xcb-xf86vidmode.el similarity index 100% rename from xcb-xf86vidmode.el rename to lib/xcb-xf86vidmode.el diff --git a/xcb-xfixes.el b/lib/xcb-xfixes.el similarity index 100% rename from xcb-xfixes.el rename to lib/xcb-xfixes.el diff --git a/xcb-xinerama.el b/lib/xcb-xinerama.el similarity index 100% rename from xcb-xinerama.el rename to lib/xcb-xinerama.el diff --git a/xcb-xinput.el b/lib/xcb-xinput.el similarity index 100% rename from xcb-xinput.el rename to lib/xcb-xinput.el diff --git a/xcb-xkb.el b/lib/xcb-xkb.el similarity index 100% rename from xcb-xkb.el rename to lib/xcb-xkb.el diff --git a/xcb-xprint.el b/lib/xcb-xprint.el similarity index 100% rename from xcb-xprint.el rename to lib/xcb-xprint.el diff --git a/xcb-xproto.el b/lib/xcb-xproto.el similarity index 100% rename from xcb-xproto.el rename to lib/xcb-xproto.el diff --git a/xcb-xselinux.el b/lib/xcb-xselinux.el similarity index 100% rename from xcb-xselinux.el rename to lib/xcb-xselinux.el diff --git a/xcb-xtest.el b/lib/xcb-xtest.el similarity index 100% rename from xcb-xtest.el rename to lib/xcb-xtest.el diff --git a/xcb-xv.el b/lib/xcb-xv.el similarity index 100% rename from xcb-xv.el rename to lib/xcb-xv.el diff --git a/xcb-xvmc.el b/lib/xcb-xvmc.el similarity index 100% rename from xcb-xvmc.el rename to lib/xcb-xvmc.el