branch: externals/xelb
commit b8f3029897dd4a182d57da8c2ee7d202bf5d9044
Author: Chris Feng <chris.w.f...@gmail.com>
Commit: Chris Feng <chris.w.f...@gmail.com>
Flatten directory structure
It seems to be the only way to get this package built.
---
lib/Makefile => Makefile | 4 ++--
el_client.el | 1 -
lib/xcb-bigreq.el => xcb-bigreq.el | 0
lib/xcb-composite.el => xcb-composite.el | 0
util/xcb-cursor.el => xcb-cursor.el | 0
lib/xcb-damage.el => xcb-damage.el | 0
lib/xcb-dpms.el => xcb-dpms.el | 0
lib/xcb-dri2.el => xcb-dri2.el | 0
lib/xcb-dri3.el => xcb-dri3.el | 0
util/xcb-ewmh.el => xcb-ewmh.el | 0
lib/xcb-ge.el => xcb-ge.el | 0
lib/xcb-glx.el => xcb-glx.el | 0
util/xcb-icccm.el => xcb-icccm.el | 0
util/xcb-keysyms.el => xcb-keysyms.el | 0
lib/xcb-present.el => xcb-present.el | 0
lib/xcb-randr.el => xcb-randr.el | 0
lib/xcb-record.el => xcb-record.el | 0
lib/xcb-render.el => xcb-render.el | 0
lib/xcb-res.el => xcb-res.el | 0
lib/xcb-screensaver.el => xcb-screensaver.el | 0
lib/xcb-shape.el => xcb-shape.el | 0
lib/xcb-shm.el => xcb-shm.el | 0
lib/xcb-sync.el => xcb-sync.el | 0
lib/xcb-xc_misc.el => xcb-xc_misc.el | 0
lib/xcb-xevie.el => xcb-xevie.el | 0
lib/xcb-xf86dri.el => xcb-xf86dri.el | 0
lib/xcb-xf86vidmode.el => xcb-xf86vidmode.el | 0
lib/xcb-xfixes.el => xcb-xfixes.el | 0
util/xcb-xim.el => xcb-xim.el | 0
lib/xcb-xinerama.el => xcb-xinerama.el | 0
lib/xcb-xinput.el => xcb-xinput.el | 0
lib/xcb-xkb.el => xcb-xkb.el | 0
util/xcb-xlib.el => xcb-xlib.el | 0
lib/xcb-xprint.el => xcb-xprint.el | 0
lib/xcb-xproto.el => xcb-xproto.el | 0
lib/xcb-xselinux.el => xcb-xselinux.el | 0
lib/xcb-xtest.el => xcb-xtest.el | 0
lib/xcb-xv.el => xcb-xv.el | 0
lib/xcb-xvmc.el => xcb-xvmc.el | 0
39 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/Makefile b/Makefile
similarity index 89%
rename from lib/Makefile
rename to Makefile
index 3bd2e7e..3f41490 100644
--- a/lib/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PROTO_PATH := ../../xcb-proto/src
+PROTO_PATH := ../xcb-proto/src
EMACS_BIN := emacs -Q
@@ -12,7 +12,7 @@ all: clean $(LIBS)
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
diff --git a/el_client.el b/el_client.el
index ce5fa32..d9b81c3 100644
--- a/el_client.el
+++ b/el_client.el
@@ -536,7 +536,6 @@ 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/lib/xcb-bigreq.el b/xcb-bigreq.el
similarity index 100%
rename from lib/xcb-bigreq.el
rename to xcb-bigreq.el
diff --git a/lib/xcb-composite.el b/xcb-composite.el
similarity index 100%
rename from lib/xcb-composite.el
rename to xcb-composite.el
diff --git a/util/xcb-cursor.el b/xcb-cursor.el
similarity index 100%
rename from util/xcb-cursor.el
rename to xcb-cursor.el
diff --git a/lib/xcb-damage.el b/xcb-damage.el
similarity index 100%
rename from lib/xcb-damage.el
rename to xcb-damage.el
diff --git a/lib/xcb-dpms.el b/xcb-dpms.el
similarity index 100%
rename from lib/xcb-dpms.el
rename to xcb-dpms.el
diff --git a/lib/xcb-dri2.el b/xcb-dri2.el
similarity index 100%
rename from lib/xcb-dri2.el
rename to xcb-dri2.el
diff --git a/lib/xcb-dri3.el b/xcb-dri3.el
similarity index 100%
rename from lib/xcb-dri3.el
rename to xcb-dri3.el
diff --git a/util/xcb-ewmh.el b/xcb-ewmh.el
similarity index 100%
rename from util/xcb-ewmh.el
rename to xcb-ewmh.el
diff --git a/lib/xcb-ge.el b/xcb-ge.el
similarity index 100%
rename from lib/xcb-ge.el
rename to xcb-ge.el
diff --git a/lib/xcb-glx.el b/xcb-glx.el
similarity index 100%
rename from lib/xcb-glx.el
rename to xcb-glx.el
diff --git a/util/xcb-icccm.el b/xcb-icccm.el
similarity index 100%
rename from util/xcb-icccm.el
rename to xcb-icccm.el
diff --git a/util/xcb-keysyms.el b/xcb-keysyms.el
similarity index 100%
rename from util/xcb-keysyms.el
rename to xcb-keysyms.el
diff --git a/lib/xcb-present.el b/xcb-present.el
similarity index 100%
rename from lib/xcb-present.el
rename to xcb-present.el
diff --git a/lib/xcb-randr.el b/xcb-randr.el
similarity index 100%
rename from lib/xcb-randr.el
rename to xcb-randr.el
diff --git a/lib/xcb-record.el b/xcb-record.el
similarity index 100%
rename from lib/xcb-record.el
rename to xcb-record.el
diff --git a/lib/xcb-render.el b/xcb-render.el
similarity index 100%
rename from lib/xcb-render.el
rename to xcb-render.el
diff --git a/lib/xcb-res.el b/xcb-res.el
similarity index 100%
rename from lib/xcb-res.el
rename to xcb-res.el
diff --git a/lib/xcb-screensaver.el b/xcb-screensaver.el
similarity index 100%
rename from lib/xcb-screensaver.el
rename to xcb-screensaver.el
diff --git a/lib/xcb-shape.el b/xcb-shape.el
similarity index 100%
rename from lib/xcb-shape.el
rename to xcb-shape.el
diff --git a/lib/xcb-shm.el b/xcb-shm.el
similarity index 100%
rename from lib/xcb-shm.el
rename to xcb-shm.el
diff --git a/lib/xcb-sync.el b/xcb-sync.el
similarity index 100%
rename from lib/xcb-sync.el
rename to xcb-sync.el
diff --git a/lib/xcb-xc_misc.el b/xcb-xc_misc.el
similarity index 100%
rename from lib/xcb-xc_misc.el
rename to xcb-xc_misc.el
diff --git a/lib/xcb-xevie.el b/xcb-xevie.el
similarity index 100%
rename from lib/xcb-xevie.el
rename to xcb-xevie.el
diff --git a/lib/xcb-xf86dri.el b/xcb-xf86dri.el
similarity index 100%
rename from lib/xcb-xf86dri.el
rename to xcb-xf86dri.el
diff --git a/lib/xcb-xf86vidmode.el b/xcb-xf86vidmode.el
similarity index 100%
rename from lib/xcb-xf86vidmode.el
rename to xcb-xf86vidmode.el
diff --git a/lib/xcb-xfixes.el b/xcb-xfixes.el
similarity index 100%
rename from lib/xcb-xfixes.el
rename to xcb-xfixes.el
diff --git a/util/xcb-xim.el b/xcb-xim.el
similarity index 100%
rename from util/xcb-xim.el
rename to xcb-xim.el
diff --git a/lib/xcb-xinerama.el b/xcb-xinerama.el
similarity index 100%
rename from lib/xcb-xinerama.el
rename to xcb-xinerama.el
diff --git a/lib/xcb-xinput.el b/xcb-xinput.el
similarity index 100%
rename from lib/xcb-xinput.el
rename to xcb-xinput.el
diff --git a/lib/xcb-xkb.el b/xcb-xkb.el
similarity index 100%
rename from lib/xcb-xkb.el
rename to xcb-xkb.el
diff --git a/util/xcb-xlib.el b/xcb-xlib.el
similarity index 100%
rename from util/xcb-xlib.el
rename to xcb-xlib.el
diff --git a/lib/xcb-xprint.el b/xcb-xprint.el
similarity index 100%
rename from lib/xcb-xprint.el
rename to xcb-xprint.el
diff --git a/lib/xcb-xproto.el b/xcb-xproto.el
similarity index 100%
rename from lib/xcb-xproto.el
rename to xcb-xproto.el
diff --git a/lib/xcb-xselinux.el b/xcb-xselinux.el
similarity index 100%
rename from lib/xcb-xselinux.el
rename to xcb-xselinux.el
diff --git a/lib/xcb-xtest.el b/xcb-xtest.el
similarity index 100%
rename from lib/xcb-xtest.el
rename to xcb-xtest.el
diff --git a/lib/xcb-xv.el b/xcb-xv.el
similarity index 100%
rename from lib/xcb-xv.el
rename to xcb-xv.el
diff --git a/lib/xcb-xvmc.el b/xcb-xvmc.el
similarity index 100%
rename from lib/xcb-xvmc.el
rename to xcb-xvmc.el
