build: refactor source tree

before
/pepper/src
/$submodule/src
...

after
/src/pepper
/src/$submodule
...

Change-Id: If418af10a2d2f9f8018de1b4ec26211b772a4b49

diff --git a/desktop-shell/Makefile.am b/desktop-shell/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/desktop-shell/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/doctor/Makefile.am b/doctor/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/doctor/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/drm/Makefile.am b/drm/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/drm/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/fbdev/Makefile.am b/fbdev/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/fbdev/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/libinput/Makefile.am b/libinput/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/libinput/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/pepper/Makefile.am b/pepper/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/pepper/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/render/Makefile.am b/render/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/render/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/samples/Makefile.am b/samples/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/samples/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/doctor/src/Makefile.am b/src/bin/doctor/Makefile.am
similarity index 100%
rename from doctor/src/Makefile.am
rename to src/bin/doctor/Makefile.am

diff --git a/x11/autogen.sh b/src/bin/doctor/autogen.sh
similarity index 100%
rename from x11/autogen.sh
rename to src/bin/doctor/autogen.sh

diff --git a/doctor/configure.ac b/src/bin/doctor/configure.ac
similarity index 98%
rename from doctor/configure.ac
rename to src/bin/doctor/configure.ac
index dfa043a..510cd7d 100644 (file)
--- a/doctor/configure.ac
+++ b/src/bin/doctor/configure.ac
@@ -27,7 +27,6 @@ PKG_CHECK_MODULES(DOCTOR, [$DOCTOR_MODULES])
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
 ])
 
 AC_OUTPUT

diff --git a/doctor/src/server.c b/src/bin/doctor/server.c
similarity index 100%
rename from doctor/src/server.c
rename to src/bin/doctor/server.c

diff --git a/desktop-shell/src/Makefile.am b/src/lib/desktop-shell/Makefile.am
similarity index 100%
rename from desktop-shell/src/Makefile.am
rename to src/lib/desktop-shell/Makefile.am

diff --git a/wayland/autogen.sh b/src/lib/desktop-shell/autogen.sh
similarity index 100%
rename from wayland/autogen.sh
rename to src/lib/desktop-shell/autogen.sh

diff --git a/desktop-shell/configure.ac b/src/lib/desktop-shell/configure.ac
similarity index 97%
rename from desktop-shell/configure.ac
rename to src/lib/desktop-shell/configure.ac
index 33420fc..81b4394 100644 (file)
--- a/desktop-shell/configure.ac
+++ b/src/lib/desktop-shell/configure.ac
@@ -35,8 +35,7 @@ fi
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/pepper-desktop-shell.pc
+pepper-desktop-shell.pc
 ])
 
 AC_OUTPUT

diff --git a/desktop-shell/src/desktop-shell-internal.h b/src/lib/desktop-shell/desktop-shell-internal.h
similarity index 100%
rename from desktop-shell/src/desktop-shell-internal.h
rename to src/lib/desktop-shell/desktop-shell-internal.h

diff --git a/desktop-shell/src/pepper-desktop-shell.h b/src/lib/desktop-shell/pepper-desktop-shell.h
similarity index 100%
rename from desktop-shell/src/pepper-desktop-shell.h
rename to src/lib/desktop-shell/pepper-desktop-shell.h

diff --git a/desktop-shell/src/pepper-desktop-shell.pc.in b/src/lib/desktop-shell/pepper-desktop-shell.pc.in
similarity index 100%
rename from desktop-shell/src/pepper-desktop-shell.pc.in
rename to src/lib/desktop-shell/pepper-desktop-shell.pc.in

diff --git a/desktop-shell/protocol/xdg-shell.xml b/src/lib/desktop-shell/protocol/xdg-shell.xml
similarity index 100%
rename from desktop-shell/protocol/xdg-shell.xml
rename to src/lib/desktop-shell/protocol/xdg-shell.xml

diff --git a/desktop-shell/src/shell-surface.c b/src/lib/desktop-shell/shell-surface.c
similarity index 100%
rename from desktop-shell/src/shell-surface.c
rename to src/lib/desktop-shell/shell-surface.c

diff --git a/desktop-shell/src/shell.c b/src/lib/desktop-shell/shell.c
similarity index 100%
rename from desktop-shell/src/shell.c
rename to src/lib/desktop-shell/shell.c

diff --git a/desktop-shell/src/wl-shell.c b/src/lib/desktop-shell/wl-shell.c
similarity index 100%
rename from desktop-shell/src/wl-shell.c
rename to src/lib/desktop-shell/wl-shell.c

diff --git a/desktop-shell/src/xdg-shell.c b/src/lib/desktop-shell/xdg-shell.c
similarity index 100%
rename from desktop-shell/src/xdg-shell.c
rename to src/lib/desktop-shell/xdg-shell.c

diff --git a/drm/src/Makefile.am b/src/lib/drm/Makefile.am
similarity index 100%
rename from drm/src/Makefile.am
rename to src/lib/drm/Makefile.am

diff --git a/samples/autogen.sh b/src/lib/drm/autogen.sh
similarity index 100%
rename from samples/autogen.sh
rename to src/lib/drm/autogen.sh

diff --git a/drm/configure.ac b/src/lib/drm/configure.ac
similarity index 96%
rename from drm/configure.ac
rename to src/lib/drm/configure.ac
index 5b2368a..903591f 100644 (file)
--- a/drm/configure.ac
+++ b/src/lib/drm/configure.ac
@@ -29,8 +29,7 @@ AC_SUBST([PEPPER_DRM_REQUIRES], [$PEPPER_DRM_MODULES])
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/pepper-drm.pc
+pepper-drm.pc
 ])
 
 AC_OUTPUT

diff --git a/drm/src/drm-common.c b/src/lib/drm/drm-common.c
similarity index 100%
rename from drm/src/drm-common.c
rename to src/lib/drm/drm-common.c

diff --git a/drm/src/drm-internal.h b/src/lib/drm/drm-internal.h
similarity index 100%
rename from drm/src/drm-internal.h
rename to src/lib/drm/drm-internal.h

diff --git a/drm/src/drm-output.c b/src/lib/drm/drm-output.c
similarity index 100%
rename from drm/src/drm-output.c
rename to src/lib/drm/drm-output.c

diff --git a/drm/src/pepper-drm.h b/src/lib/drm/pepper-drm.h
similarity index 100%
rename from drm/src/pepper-drm.h
rename to src/lib/drm/pepper-drm.h

diff --git a/drm/src/pepper-drm.pc.in b/src/lib/drm/pepper-drm.pc.in
similarity index 100%
rename from drm/src/pepper-drm.pc.in
rename to src/lib/drm/pepper-drm.pc.in

diff --git a/fbdev/src/Makefile.am b/src/lib/fbdev/Makefile.am
similarity index 100%
rename from fbdev/src/Makefile.am
rename to src/lib/fbdev/Makefile.am

diff --git a/render/autogen.sh b/src/lib/fbdev/autogen.sh
similarity index 100%
rename from render/autogen.sh
rename to src/lib/fbdev/autogen.sh

diff --git a/fbdev/configure.ac b/src/lib/fbdev/configure.ac
similarity index 96%
rename from fbdev/configure.ac
rename to src/lib/fbdev/configure.ac
index 247ffe3..229c103 100644 (file)
--- a/fbdev/configure.ac
+++ b/src/lib/fbdev/configure.ac
@@ -29,8 +29,7 @@ AC_SUBST([PEPPER_FBDEV_REQUIRES], [$PEPPER_FBDEV_MODULES])
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/pepper-fbdev.pc
+pepper-fbdev.pc
 ])
 
 AC_OUTPUT

diff --git a/fbdev/src/fbdev-common.c b/src/lib/fbdev/fbdev-common.c
similarity index 100%
rename from fbdev/src/fbdev-common.c
rename to src/lib/fbdev/fbdev-common.c

diff --git a/fbdev/src/fbdev-internal.h b/src/lib/fbdev/fbdev-internal.h
similarity index 100%
rename from fbdev/src/fbdev-internal.h
rename to src/lib/fbdev/fbdev-internal.h

diff --git a/fbdev/src/fbdev-output.c b/src/lib/fbdev/fbdev-output.c
similarity index 100%
rename from fbdev/src/fbdev-output.c
rename to src/lib/fbdev/fbdev-output.c

diff --git a/fbdev/src/pepper-fbdev.h b/src/lib/fbdev/pepper-fbdev.h
similarity index 100%
rename from fbdev/src/pepper-fbdev.h
rename to src/lib/fbdev/pepper-fbdev.h

diff --git a/fbdev/src/pepper-fbdev.pc.in b/src/lib/fbdev/pepper-fbdev.pc.in
similarity index 100%
rename from fbdev/src/pepper-fbdev.pc.in
rename to src/lib/fbdev/pepper-fbdev.pc.in

diff --git a/libinput/src/Makefile.am b/src/lib/libinput/Makefile.am
similarity index 100%
rename from libinput/src/Makefile.am
rename to src/lib/libinput/Makefile.am

diff --git a/pepper/autogen.sh b/src/lib/libinput/autogen.sh
similarity index 100%
rename from pepper/autogen.sh
rename to src/lib/libinput/autogen.sh

diff --git a/libinput/configure.ac b/src/lib/libinput/configure.ac
similarity index 96%
rename from libinput/configure.ac
rename to src/lib/libinput/configure.ac
index 907f06e..174ccb5 100644 (file)
--- a/libinput/configure.ac
+++ b/src/lib/libinput/configure.ac
@@ -28,8 +28,7 @@ AC_SUBST([PEPPER_LIBINPUT_REQUIRES], [$PEPPER_LIBINPUT_MODULES])
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/pepper-libinput.pc
+pepper-libinput.pc
 ])
 
 AC_OUTPUT

diff --git a/libinput/src/libinput-internal.h b/src/lib/libinput/libinput-internal.h
similarity index 100%
rename from libinput/src/libinput-internal.h
rename to src/lib/libinput/libinput-internal.h

diff --git a/libinput/src/libinput.c b/src/lib/libinput/libinput.c
similarity index 100%
rename from libinput/src/libinput.c
rename to src/lib/libinput/libinput.c

diff --git a/libinput/src/pepper-libinput.h b/src/lib/libinput/pepper-libinput.h
similarity index 100%
rename from libinput/src/pepper-libinput.h
rename to src/lib/libinput/pepper-libinput.h

diff --git a/libinput/src/pepper-libinput.pc.in b/src/lib/libinput/pepper-libinput.pc.in
similarity index 100%
rename from libinput/src/pepper-libinput.pc.in
rename to src/lib/libinput/pepper-libinput.pc.in

diff --git a/pepper/AUTHORS b/src/lib/pepper/AUTHORS
similarity index 100%
rename from pepper/AUTHORS
rename to src/lib/pepper/AUTHORS

diff --git a/pepper/CODING_STYLE b/src/lib/pepper/CODING_STYLE
similarity index 100%
rename from pepper/CODING_STYLE
rename to src/lib/pepper/CODING_STYLE

diff --git a/pepper/COPYING b/src/lib/pepper/COPYING
similarity index 100%
rename from pepper/COPYING
rename to src/lib/pepper/COPYING

diff --git a/pepper/src/Makefile.am b/src/lib/pepper/Makefile.am
similarity index 100%
rename from pepper/src/Makefile.am
rename to src/lib/pepper/Makefile.am

diff --git a/pepper/README b/src/lib/pepper/README
similarity index 100%
rename from pepper/README
rename to src/lib/pepper/README

diff --git a/libinput/autogen.sh b/src/lib/pepper/autogen.sh
similarity index 100%
rename from libinput/autogen.sh
rename to src/lib/pepper/autogen.sh

diff --git a/pepper/src/buffer.c b/src/lib/pepper/buffer.c
similarity index 100%
rename from pepper/src/buffer.c
rename to src/lib/pepper/buffer.c

diff --git a/pepper/src/common.c b/src/lib/pepper/common.c
similarity index 100%
rename from pepper/src/common.c
rename to src/lib/pepper/common.c

diff --git a/pepper/src/common.h b/src/lib/pepper/common.h
similarity index 100%
rename from pepper/src/common.h
rename to src/lib/pepper/common.h

diff --git a/pepper/src/compositor.c b/src/lib/pepper/compositor.c
similarity index 100%
rename from pepper/src/compositor.c
rename to src/lib/pepper/compositor.c

diff --git a/pepper/configure.ac b/src/lib/pepper/configure.ac
similarity index 96%
rename from pepper/configure.ac
rename to src/lib/pepper/configure.ac
index 900b221..b7b31ba 100644 (file)
--- a/pepper/configure.ac
+++ b/src/lib/pepper/configure.ac
@@ -28,8 +28,7 @@ AC_SUBST([PEPPER_REQUIRES], [$PEPPER_MODULES])
 # Output files
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/pepper.pc
+pepper.pc
 ])
 
 AC_OUTPUT

diff --git a/pepper/src/data-device.c b/src/lib/pepper/data-device.c
similarity index 100%
rename from pepper/src/data-device.c
rename to src/lib/pepper/data-device.c

diff --git a/pepper/src/input.c b/src/lib/pepper/input.c
similarity index 100%
rename from pepper/src/input.c
rename to src/lib/pepper/input.c

diff --git a/pepper/src/object.c b/src/lib/pepper/object.c
similarity index 100%
rename from pepper/src/object.c
rename to src/lib/pepper/object.c

diff --git a/pepper/src/output.c b/src/lib/pepper/output.c
similarity index 100%
rename from pepper/src/output.c
rename to src/lib/pepper/output.c

diff --git a/pepper/packaging/pepper.spec b/src/lib/pepper/packaging/pepper.spec
similarity index 100%
rename from pepper/packaging/pepper.spec
rename to src/lib/pepper/packaging/pepper.spec

diff --git a/pepper/src/pepper-input-backend.h b/src/lib/pepper/pepper-input-backend.h
similarity index 100%
rename from pepper/src/pepper-input-backend.h
rename to src/lib/pepper/pepper-input-backend.h

diff --git a/pepper/src/pepper-internal.h b/src/lib/pepper/pepper-internal.h
similarity index 100%
rename from pepper/src/pepper-internal.h
rename to src/lib/pepper/pepper-internal.h

diff --git a/pepper/src/pepper-output-backend.h b/src/lib/pepper/pepper-output-backend.h
similarity index 100%
rename from pepper/src/pepper-output-backend.h
rename to src/lib/pepper/pepper-output-backend.h

diff --git a/pepper/src/pepper-utils.h b/src/lib/pepper/pepper-utils.h
similarity index 100%
rename from pepper/src/pepper-utils.h
rename to src/lib/pepper/pepper-utils.h

diff --git a/pepper/src/pepper.h b/src/lib/pepper/pepper.h
similarity index 100%
rename from pepper/src/pepper.h
rename to src/lib/pepper/pepper.h

diff --git a/pepper/src/pepper.pc.in b/src/lib/pepper/pepper.pc.in
similarity index 100%
rename from pepper/src/pepper.pc.in
rename to src/lib/pepper/pepper.pc.in

diff --git a/pepper/src/plane.c b/src/lib/pepper/plane.c
similarity index 100%
rename from pepper/src/plane.c
rename to src/lib/pepper/plane.c

diff --git a/pepper/src/region.c b/src/lib/pepper/region.c
similarity index 100%
rename from pepper/src/region.c
rename to src/lib/pepper/region.c

diff --git a/pepper/src/surface.c b/src/lib/pepper/surface.c
similarity index 100%
rename from pepper/src/surface.c
rename to src/lib/pepper/surface.c

diff --git a/pepper/src/utils-file.c b/src/lib/pepper/utils-file.c
similarity index 100%
rename from pepper/src/utils-file.c
rename to src/lib/pepper/utils-file.c

diff --git a/pepper/src/utils-log.c b/src/lib/pepper/utils-log.c
similarity index 100%
rename from pepper/src/utils-log.c
rename to src/lib/pepper/utils-log.c

diff --git a/pepper/src/utils-map.c b/src/lib/pepper/utils-map.c
similarity index 100%
rename from pepper/src/utils-map.c
rename to src/lib/pepper/utils-map.c

diff --git a/pepper/src/utils-vt.c b/src/lib/pepper/utils-vt.c
similarity index 100%
rename from pepper/src/utils-vt.c
rename to src/lib/pepper/utils-vt.c

diff --git a/pepper/src/view.c b/src/lib/pepper/view.c
similarity index 100%
rename from pepper/src/view.c
rename to src/lib/pepper/view.c

diff --git a/render/src/Makefile.am b/src/lib/render/Makefile.am
similarity index 100%
rename from render/src/Makefile.am
rename to src/lib/render/Makefile.am

diff --git a/fbdev/autogen.sh b/src/lib/render/autogen.sh
similarity index 100%
rename from fbdev/autogen.sh
rename to src/lib/render/autogen.sh

diff --git a/render/configure.ac b/src/lib/render/configure.ac
similarity index 98%
rename from render/configure.ac
rename to src/lib/render/configure.ac
index fdfeb73..e3dbbdc 100644 (file)
--- a/render/configure.ac
+++ b/src/lib/render/configure.ac
@@ -52,8 +52,7 @@ AC_SUBST([PEPPER_RENDER_REQUIRES], [$PEPPER_RENDER_MODULES])
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/pepper-render.pc
+pepper-render.pc
 ])
 
 AC_OUTPUT

diff --git a/render/src/eglextwayland.h b/src/lib/render/eglextwayland.h
similarity index 100%
rename from render/src/eglextwayland.h
rename to src/lib/render/eglextwayland.h

diff --git a/render/src/gl-renderer.c b/src/lib/render/gl-renderer.c
similarity index 100%
rename from render/src/gl-renderer.c
rename to src/lib/render/gl-renderer.c

diff --git a/render/src/pepper-gl-renderer.h b/src/lib/render/pepper-gl-renderer.h
similarity index 100%
rename from render/src/pepper-gl-renderer.h
rename to src/lib/render/pepper-gl-renderer.h

diff --git a/render/src/pepper-pixman-renderer.h b/src/lib/render/pepper-pixman-renderer.h
similarity index 100%
rename from render/src/pepper-pixman-renderer.h
rename to src/lib/render/pepper-pixman-renderer.h

diff --git a/render/src/pepper-render-internal.h b/src/lib/render/pepper-render-internal.h
similarity index 100%
rename from render/src/pepper-render-internal.h
rename to src/lib/render/pepper-render-internal.h

diff --git a/render/src/pepper-render.h b/src/lib/render/pepper-render.h
similarity index 100%
rename from render/src/pepper-render.h
rename to src/lib/render/pepper-render.h

diff --git a/render/src/pepper-render.pc.in b/src/lib/render/pepper-render.pc.in
similarity index 100%
rename from render/src/pepper-render.pc.in
rename to src/lib/render/pepper-render.pc.in

diff --git a/render/src/pixman-renderer.c b/src/lib/render/pixman-renderer.c
similarity index 100%
rename from render/src/pixman-renderer.c
rename to src/lib/render/pixman-renderer.c

diff --git a/render/src/renderer.c b/src/lib/render/renderer.c
similarity index 100%
rename from render/src/renderer.c
rename to src/lib/render/renderer.c

diff --git a/wayland/src/Makefile.am b/src/lib/wayland/Makefile.am
similarity index 100%
rename from wayland/src/Makefile.am
rename to src/lib/wayland/Makefile.am

diff --git a/drm/autogen.sh b/src/lib/wayland/autogen.sh
similarity index 100%
rename from drm/autogen.sh
rename to src/lib/wayland/autogen.sh

diff --git a/wayland/configure.ac b/src/lib/wayland/configure.ac
similarity index 96%
rename from wayland/configure.ac
rename to src/lib/wayland/configure.ac
index 94d4d47..b992110 100644 (file)
--- a/wayland/configure.ac
+++ b/src/lib/wayland/configure.ac
@@ -27,8 +27,7 @@ AC_SUBST([PEPPER_WAYLAND_REQUIRES], [$PEPPER_WAYLAND_MODULES])
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/pepper-wayland.pc
+pepper-wayland.pc
 ])
 
 AC_OUTPUT

diff --git a/wayland/src/pepper-wayland.h b/src/lib/wayland/pepper-wayland.h
similarity index 100%
rename from wayland/src/pepper-wayland.h
rename to src/lib/wayland/pepper-wayland.h

diff --git a/wayland/src/pepper-wayland.pc.in b/src/lib/wayland/pepper-wayland.pc.in
similarity index 100%
rename from wayland/src/pepper-wayland.pc.in
rename to src/lib/wayland/pepper-wayland.pc.in

diff --git a/wayland/src/wayland-common.c b/src/lib/wayland/wayland-common.c
similarity index 100%
rename from wayland/src/wayland-common.c
rename to src/lib/wayland/wayland-common.c

diff --git a/wayland/src/wayland-input.c b/src/lib/wayland/wayland-input.c
similarity index 100%
rename from wayland/src/wayland-input.c
rename to src/lib/wayland/wayland-input.c

diff --git a/wayland/src/wayland-internal.h b/src/lib/wayland/wayland-internal.h
similarity index 100%
rename from wayland/src/wayland-internal.h
rename to src/lib/wayland/wayland-internal.h

diff --git a/wayland/src/wayland-output.c b/src/lib/wayland/wayland-output.c
similarity index 100%
rename from wayland/src/wayland-output.c
rename to src/lib/wayland/wayland-output.c

diff --git a/wayland/src/wayland-shm-buffer.c b/src/lib/wayland/wayland-shm-buffer.c
similarity index 100%
rename from wayland/src/wayland-shm-buffer.c
rename to src/lib/wayland/wayland-shm-buffer.c

diff --git a/x11/src/Makefile.am b/src/lib/x11/Makefile.am
similarity index 100%
rename from x11/src/Makefile.am
rename to src/lib/x11/Makefile.am

diff --git a/doctor/autogen.sh b/src/lib/x11/autogen.sh
similarity index 100%
rename from doctor/autogen.sh
rename to src/lib/x11/autogen.sh

diff --git a/x11/configure.ac b/src/lib/x11/configure.ac
similarity index 96%
rename from x11/configure.ac
rename to src/lib/x11/configure.ac
index 5576b5b..6340f3e 100644 (file)
--- a/x11/configure.ac
+++ b/src/lib/x11/configure.ac
@@ -27,8 +27,7 @@ AC_SUBST([PEPPER_X11_REQUIRES], [$PEPPER_X11_MODULES])
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/pepper-x11.pc
+pepper-x11.pc
 ])
 
 AC_OUTPUT

diff --git a/x11/src/pepper-x11.h b/src/lib/x11/pepper-x11.h
similarity index 100%
rename from x11/src/pepper-x11.h
rename to src/lib/x11/pepper-x11.h

diff --git a/x11/src/pepper-x11.pc.in b/src/lib/x11/pepper-x11.pc.in
similarity index 100%
rename from x11/src/pepper-x11.pc.in
rename to src/lib/x11/pepper-x11.pc.in

diff --git a/x11/src/x11-common.c b/src/lib/x11/x11-common.c
similarity index 100%
rename from x11/src/x11-common.c
rename to src/lib/x11/x11-common.c

diff --git a/x11/src/x11-cursor.c b/src/lib/x11/x11-cursor.c
similarity index 100%
rename from x11/src/x11-cursor.c
rename to src/lib/x11/x11-cursor.c

diff --git a/x11/src/x11-input.c b/src/lib/x11/x11-input.c
similarity index 100%
rename from x11/src/x11-input.c
rename to src/lib/x11/x11-input.c

diff --git a/x11/src/x11-internal.h b/src/lib/x11/x11-internal.h
similarity index 100%
rename from x11/src/x11-internal.h
rename to src/lib/x11/x11-internal.h

diff --git a/x11/src/x11-output.c b/src/lib/x11/x11-output.c
similarity index 100%
rename from x11/src/x11-output.c
rename to src/lib/x11/x11-output.c

diff --git a/samples/src/Makefile.am b/src/samples/Makefile.am
similarity index 100%
rename from samples/src/Makefile.am
rename to src/samples/Makefile.am

diff --git a/desktop-shell/autogen.sh b/src/samples/autogen.sh
similarity index 100%
rename from desktop-shell/autogen.sh
rename to src/samples/autogen.sh

diff --git a/samples/configure.ac b/src/samples/configure.ac
similarity index 99%
rename from samples/configure.ac
rename to src/samples/configure.ac
index ca3bfa7..75d0a30 100644 (file)
--- a/samples/configure.ac
+++ b/src/samples/configure.ac
@@ -49,7 +49,6 @@ PKG_CHECK_MODULES(SIMPLE_SHM, [wayland-client pepper])
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
 ])
 
 AC_OUTPUT

diff --git a/samples/src/drm-backend.c b/src/samples/drm-backend.c
similarity index 100%
rename from samples/src/drm-backend.c
rename to src/samples/drm-backend.c

diff --git a/samples/src/fbdev-backend.c b/src/samples/fbdev-backend.c
similarity index 100%
rename from samples/src/fbdev-backend.c
rename to src/samples/fbdev-backend.c

diff --git a/samples/src/simple-shm.c b/src/samples/simple-shm.c
similarity index 100%
rename from samples/src/simple-shm.c
rename to src/samples/simple-shm.c

diff --git a/samples/src/simple-touch.c b/src/samples/simple-touch.c
similarity index 100%
rename from samples/src/simple-touch.c
rename to src/samples/simple-touch.c

diff --git a/samples/src/wayland-backend.c b/src/samples/wayland-backend.c
similarity index 100%
rename from samples/src/wayland-backend.c
rename to src/samples/wayland-backend.c

diff --git a/samples/src/x11-backend.c b/src/samples/x11-backend.c
similarity index 100%
rename from samples/src/x11-backend.c
rename to src/samples/x11-backend.c

diff --git a/wayland/Makefile.am b/wayland/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/wayland/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src

diff --git a/x11/Makefile.am b/x11/Makefile.am
deleted file mode 100644 (file)
index af437a6..0000000
--- a/x11/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src