[mutter/wayland] Move weston-launch to backends/
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] Move weston-launch to backends/
- Date: Tue, 1 Apr 2014 03:49:35 +0000 (UTC)
commit 20547e3b63c623e0de25755de49be491b6b3322b
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Mar 31 22:47:45 2014 -0400
Move weston-launch to backends/
It's about display servers, not Wayland integration.
src/Makefile.am | 6 +++---
src/{wayland => backends}/meta-weston-launch.c | 2 +-
src/{wayland => backends}/meta-weston-launch.h | 0
src/{wayland => backends}/weston-launch.c | 0
src/{wayland => backends}/weston-launch.h | 0
5 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e7fad42..6eb4dc5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,6 +75,8 @@ libmutter_wayland_la_SOURCES = \
backends/meta-monitor-manager-kms.h \
backends/meta-monitor-manager-xrandr.c \
backends/meta-monitor-manager-xrandr.h \
+ backends/meta-weston-launch.c \
+ backends/meta-weston-launch.h \
core/above-tab-keycode.c \
core/barrier.c \
meta/barrier.h \
@@ -226,8 +228,6 @@ libmutter_wayland_la_SOURCES = \
wayland/meta-wayland-surface.h \
wayland/meta-wayland-types.h \
wayland/meta-wayland-versions.h \
- wayland/meta-weston-launch.c \
- wayland/meta-weston-launch.h \
wayland/window-wayland.c \
wayland/window-wayland.h
@@ -286,7 +286,7 @@ mutter_wayland_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
bin_PROGRAMS+=mutter-launch
-mutter_launch_SOURCES = wayland/weston-launch.c wayland/weston-launch.h
+mutter_launch_SOURCES = backends/weston-launch.c backends/weston-launch.h
mutter_launch_CFLAGS = $(MUTTER_LAUNCH_CFLAGS) -DLIBDIR=\"$(libdir)\"
mutter_launch_LDFLAGS = $(MUTTER_LAUNCH_LIBS) -lpam
diff --git a/src/wayland/meta-weston-launch.c b/src/backends/meta-weston-launch.c
similarity index 99%
rename from src/wayland/meta-weston-launch.c
rename to src/backends/meta-weston-launch.c
index 6ef5c69..a77b2ea 100644
--- a/src/wayland/meta-weston-launch.c
+++ b/src/backends/meta-weston-launch.c
@@ -42,7 +42,7 @@
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "meta-wayland-private.h"
+#include "wayland/meta-wayland-private.h"
#include "meta-cursor-tracker-private.h"
#include "meta-weston-launch.h"
diff --git a/src/wayland/meta-weston-launch.h b/src/backends/meta-weston-launch.h
similarity index 100%
rename from src/wayland/meta-weston-launch.h
rename to src/backends/meta-weston-launch.h
diff --git a/src/wayland/weston-launch.c b/src/backends/weston-launch.c
similarity index 100%
rename from src/wayland/weston-launch.c
rename to src/backends/weston-launch.c
diff --git a/src/wayland/weston-launch.h b/src/backends/weston-launch.h
similarity index 100%
rename from src/wayland/weston-launch.h
rename to src/backends/weston-launch.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]