Move extension descriptions out of extensions/ subdirectory

Now that the extensions do not get installed to an extensions/ subdirectory,
move them out of the extensions/ subdirectory in the source as well.

diff --git a/src/Makefile.am b/src/Makefile.am
index 20225fa..dd0d329 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,30 @@
 xcbinclude_HEADERS = \
        xcb.xsd \
        xproto.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/xinerama.xml \
-       extensions/xf86dri.xml \
-       extensions/xfixes.xml \
-       extensions/xprint.xml \
-       extensions/xtest.xml \
-       extensions/xv.xml        \
-       extensions/xvmc.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 \
+       xinerama.xml \
+       xf86dri.xml \
+       xfixes.xml \
+       xprint.xml \
+       xtest.xml \
+       xv.xml \
+       xvmc.xml
 
 if HAVE_XMLLINT
 check-local:
-       $(XMLLINT) --noout --schema $(srcdir)/xcb.xsd \
-                  $(srcdir)/*.xml $(srcdir)/extensions/*.xml
+       $(XMLLINT) --noout --schema $(srcdir)/xcb.xsd $(srcdir)/*.xml
 endif

diff --git a/src/extensions/bigreq.xml b/src/bigreq.xml
similarity index 100%
rename from src/extensions/bigreq.xml
rename to src/bigreq.xml

diff --git a/src/extensions/composite.xml b/src/composite.xml
similarity index 100%
rename from src/extensions/composite.xml
rename to src/composite.xml

diff --git a/src/extensions/damage.xml b/src/damage.xml
similarity index 100%
rename from src/extensions/damage.xml
rename to src/damage.xml

diff --git a/src/extensions/dpms.xml b/src/dpms.xml
similarity index 100%
rename from src/extensions/dpms.xml
rename to src/dpms.xml

diff --git a/src/extensions/glx.xml b/src/glx.xml
similarity index 100%
rename from src/extensions/glx.xml
rename to src/glx.xml

diff --git a/src/extensions/randr.xml b/src/randr.xml
similarity index 100%
rename from src/extensions/randr.xml
rename to src/randr.xml

diff --git a/src/extensions/record.xml b/src/record.xml
similarity index 100%
rename from src/extensions/record.xml
rename to src/record.xml

diff --git a/src/extensions/render.xml b/src/render.xml
similarity index 100%
rename from src/extensions/render.xml
rename to src/render.xml

diff --git a/src/extensions/res.xml b/src/res.xml
similarity index 100%
rename from src/extensions/res.xml
rename to src/res.xml

diff --git a/src/extensions/screensaver.xml b/src/screensaver.xml
similarity index 100%
rename from src/extensions/screensaver.xml
rename to src/screensaver.xml

diff --git a/src/extensions/shape.xml b/src/shape.xml
similarity index 100%
rename from src/extensions/shape.xml
rename to src/shape.xml

diff --git a/src/extensions/shm.xml b/src/shm.xml
similarity index 100%
rename from src/extensions/shm.xml
rename to src/shm.xml

diff --git a/src/extensions/sync.xml b/src/sync.xml
similarity index 100%
rename from src/extensions/sync.xml
rename to src/sync.xml

diff --git a/src/extensions/xc_misc.xml b/src/xc_misc.xml
similarity index 100%
rename from src/extensions/xc_misc.xml
rename to src/xc_misc.xml

diff --git a/src/extensions/xevie.xml b/src/xevie.xml
similarity index 100%
rename from src/extensions/xevie.xml
rename to src/xevie.xml

diff --git a/src/extensions/xf86dri.xml b/src/xf86dri.xml
similarity index 100%
rename from src/extensions/xf86dri.xml
rename to src/xf86dri.xml

diff --git a/src/extensions/xfixes.xml b/src/xfixes.xml
similarity index 100%
rename from src/extensions/xfixes.xml
rename to src/xfixes.xml

diff --git a/src/extensions/xinerama.xml b/src/xinerama.xml
similarity index 100%
rename from src/extensions/xinerama.xml
rename to src/xinerama.xml

diff --git a/src/extensions/xprint.xml b/src/xprint.xml
similarity index 100%
rename from src/extensions/xprint.xml
rename to src/xprint.xml

diff --git a/src/extensions/xtest.xml b/src/xtest.xml
similarity index 100%
rename from src/extensions/xtest.xml
rename to src/xtest.xml

diff --git a/src/extensions/xv.xml b/src/xv.xml
similarity index 100%
rename from src/extensions/xv.xml
rename to src/xv.xml

diff --git a/src/extensions/xvmc.xml b/src/xvmc.xml
similarity index 100%
rename from src/extensions/xvmc.xml
rename to src/xvmc.xml