Allow greeters to run in-session

[sojka/lightdm.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c2237f696a882c99f506339288dc536557ec85d8..7cc0b01a5d689c0609b2c0eb84adb0040cecce27 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,18 +4,18 @@ bin_PROGRAMS = dm-tool
 lightdm_SOURCES = \
        accounts.c \
        accounts.h \
-       configuration.c \
-       configuration.h \
        console-kit.c \
        console-kit.h \
        display-manager.c \
        display-manager.h \
        display-server.c \
        display-server.h \
-       dmrc.c \
-       dmrc.h \
        greeter.c \
        greeter.h \
+       greeter-session.c \
+       greeter-session.h \
+       greeter-socket.c \
+       greeter-socket.h \        
        guest-account.c \
        guest-account.h \
        lightdm.c \
@@ -23,24 +23,20 @@ lightdm_SOURCES = \
        logger.h \
        login1.c \
        login1.h \
-       mir-server.c \
-       mir-server.h \
+       log-file.c \
+       log-file.h \
        plymouth.c \
        plymouth.h \
-       privileges.c \
-       privileges.h \
        process.c \
        process.h \
        seat.c \
        seat.h \
-       seat-surfaceflinger.c \
-       seat-surfaceflinger.h \
+       seat-local.c \
+       seat-local.h \
        seat-unity.c \
        seat-unity.h \
        seat-xdmcp-session.c \
        seat-xdmcp-session.h \
-       seat-xlocal.c \
-       seat-xlocal.h \
        seat-xremote.c \
        seat-xremote.h \
        seat-xvnc.c \
@@ -51,18 +47,24 @@ lightdm_SOURCES = \
        session-child.h \
        session-config.c \
        session-config.h \
-       surfaceflinger-server.c \
-       surfaceflinger-server.h \
+       shared-data-manager.c \
+       shared-data-manager.h \
+       unity-system-compositor.c \
+       unity-system-compositor.h \
        vnc-server.c \
        vnc-server.h \
        vt.c \
        vt.h \
+       wayland-session.c \
+       wayland-session.h \
        x-authority.c \
        x-authority.h \
        x-server-local.c \
        x-server-local.h \
        x-server-remote.c \
        x-server-remote.h \
+       x-server-xmir.c \
+       x-server-xmir.h \
        x-server-xvnc.c \
        x-server-xvnc.h \
        x-server.c \
@@ -76,20 +78,22 @@ lightdm_SOURCES = \
        xdmcp-session-private.h
 
 lightdm_CFLAGS = \
-       $(LIGHTDM_CFLAGS) \
        $(WARN_CFLAGS) \
+       $(LIGHTDM_CFLAGS) \
+       -I"$(top_srcdir)/common" \
        -DSBIN_DIR=\"$(sbindir)\" \
-       -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
+       -DUSERS_DIR=\"$(localstatedir)/lib/lightdm-data\" \
        -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \
        -DRUN_DIR=\"$(localstatedir)/run/lightdm\" \
        -DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \
-       -DSYSTEM_CONFIG_DIR=\"$(pkgdatadir)/lightdm.conf.d\" \
-       -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions\" \
+       -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions:$(datadir)/wayland-sessions\" \
+       -DWAYLAND_SESSIONS_DIR=\"$(datadir)/wayland-sessions\" \
        -DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\" \
        -DGREETERS_DIR=\"$(pkgdatadir)/greeters:$(datadir)/xgreeters\"
 
 lightdm_LDADD = \
        $(LIGHTDM_LIBS) \
+       $(top_builddir)/common/libcommon.la \
        -lgcrypt \
        -lpam
 
@@ -97,23 +101,20 @@ dm_tool_SOURCES = \
        dm-tool.c
 
 dm_tool_CFLAGS = \
+       $(WARN_CFLAGS) \
        $(LIGHTDM_CFLAGS) \
-       -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \
        -DLOCALE_DIR=\"$(datadir)/locale\"
 
 dm_tool_LDADD = \
        $(LIGHTDM_LIBS)
 
-pkglibexec_PROGRAMS = lightdm-guest-session-wrapper
+libexec_PROGRAMS = lightdm-guest-session
 
-lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c
+lightdm_guest_session_SOURCES = lightdm-guest-session.c
 
-lightdm_guest_session_wrapper_CFLAGS = \
-       $(LIGHTDM_CFLAGS) \
-       $(WARN_CFLAGS)
+lightdm_guest_session_CFLAGS = \
+       $(WARN_CFLAGS) \
+       $(LIGHTDM_CFLAGS)
 
 EXTRA_DIST = \
        display-manager.xml
-
-DISTCLEANFILES = \
-       Makefile.in