TODO: add getty on-demand, man: --system

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 30d68a05106c11cd1d4ff9768d3193d8f32219c3..dcaf382fb4f4dc45d930b6eaad902c1d1fb33347 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,7 +89,7 @@ bin_PROGRAMS = \
 if HAVE_GTK
 bin_PROGRAMS += \
        systemadm \
-       systemd-ask-password-agent
+       systemd-gnome-ask-password-agent
 endif
 
 rootlibexec_PROGRAMS = \
@@ -185,7 +185,7 @@ dist_systemunit_DATA = \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/systemd-shutdownd.socket \
-       units/systemd-kmsg-syslogd.socket \
+       units/syslog.socket \
        units/dev-hugepages.automount \
        units/dev-hugepages.mount \
        units/dev-mqueue.automount \
@@ -855,10 +855,10 @@ systemadm_LDADD = \
        $(DBUSGLIB_LIBS) \
        $(GTK_LIBS)
 
-systemd_ask_password_agent_SOURCES = \
-       src/ask-password-agent.vala
+systemd_gnome_ask_password_agent_SOURCES = \
+       src/gnome-ask-password-agent.vala
 
-systemd_ask_password_agent_CFLAGS = \
+systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUSGLIB_CFLAGS) \
        $(GTK_CFLAGS) \
@@ -867,7 +867,7 @@ systemd_ask_password_agent_CFLAGS = \
        -Wno-shadow \
        -Wno-format-nonliteral
 
-systemd_ask_password_agent_VALAFLAGS = \
+systemd_gnome_ask_password_agent_VALAFLAGS = \
        --pkg=dbus-glib-1 \
        --pkg=posix \
        --pkg=gtk+-2.0 \
@@ -876,7 +876,7 @@ systemd_ask_password_agent_VALAFLAGS = \
        --pkg=libnotify \
        -g
 
-systemd_ask_password_agent_LDADD = \
+systemd_gnome_ask_password_agent_LDADD = \
        $(DBUSGLIB_LIBS) \
        $(GTK_LIBS)
 
@@ -1048,10 +1048,11 @@ install-data-hook:
                rm -f session && \
                $(LN_S) $(pkgsysconfdir)/session session )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \
+               rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
                $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
+               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
+               $(LN_S) ../syslog.socket syslog.socket )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
                $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )