summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-08-21 15:20:27 +1200
committerRobert Ancell <robert.ancell@canonical.com>2015-08-21 15:20:27 +1200
commite12fad6f85dc7552d37a0b94986cd245aba5536b (patch)
tree2a36856b8f9eb81b8337428fad6255eb630beba5
parentc12fdf1dbf8120a199847191ef4e2a7d76be93f1 (diff)
downloadlightdm-git-e12fad6f85dc7552d37a0b94986cd245aba5536b.tar.gz
Remove trailing whitespace from Makefiles
-rw-r--r--liblightdm-gobject/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--tests/Makefile.am4
3 files changed, 4 insertions, 4 deletions
diff --git a/liblightdm-gobject/Makefile.am b/liblightdm-gobject/Makefile.am
index 5db00557..4ef8d944 100644
--- a/liblightdm-gobject/Makefile.am
+++ b/liblightdm-gobject/Makefile.am
@@ -9,7 +9,7 @@ liblightdm_gobject_1_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \
-I"$(top_srcdir)/common" \
-DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
-DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions:$(datadir)/wayland-sessions\" \
- -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \
+ -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \
-DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\"
mainheader_HEADERS = lightdm.h
diff --git a/src/Makefile.am b/src/Makefile.am
index b56b9140..50139f91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,7 +81,7 @@ lightdm_CFLAGS = \
-DRUN_DIR=\"$(localstatedir)/run/lightdm\" \
-DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \
-DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions:$(datadir)/wayland-sessions\" \
- -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \
+ -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \
-DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\" \
-DGREETERS_DIR=\"$(pkgdatadir)/greeters:$(datadir)/xgreeters\"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d509c135..df6229cf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -383,7 +383,7 @@ EXTRA_DIST = \
scripts/autologin-new-authtok.conf \
scripts/autologin-password.conf \
scripts/autologin-previous-session.conf \
- scripts/autologin-session.conf \
+ scripts/autologin-session.conf \
scripts/autologin-session-crash.conf \
scripts/autologin-session-error.conf \
scripts/autologin-timeout.conf \
@@ -421,7 +421,7 @@ EXTRA_DIST = \
scripts/language-no-accounts-service.conf \
scripts/lock-seat.conf \
scripts/lock-seat-after-vt-switch.conf \
- scripts/lock-seat-console-kit.conf \
+ scripts/lock-seat-console-kit.conf \
scripts/lock-seat-resettable.conf \
scripts/lock-seat-return-session.conf \
scripts/lock-seat-return-session-console-kit.conf \