ask-password: rename ask-password-agent to gnome-ask-password-agent

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6cad9adc4b9ac1bf9d2929a7c610b34c87fa0cc4..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)
 
@@ -1037,19 +1037,22 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
-               $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
                $(DESTDIR)$(sysconfdir)/xdg/systemd
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                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 )
@@ -1074,10 +1077,12 @@ install-data-hook:
                $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f systemd-remount-api-vfs.service \
+                       fsck-root.service \
                        remount-rootfs.service \
                        var-run.mount \
                        var-lock.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+               $(LN_S) ../fsck-root.service fsck-root.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
                $(LN_S) ../var-lock.mount var-lock.mount )
@@ -1114,9 +1119,16 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+               rm -f quotaon.service quotacheck.service && \
+               $(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \
+               $(LN_S) $(systemunitdir)/quotaon.service quotaon.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants && \
+               rm -f hwclock-load.service && \
+               $(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \