vconsole: set keyboard mapping and font settings on Arch

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ed37278d33ed2d7068fbaf1306d9cdff8ff35abf..aa4798d83e1fec4be72933782dd0506d9a9221cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
+polkitpolicydir=$(datadir)/polkit-1/actions
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -56,14 +57,16 @@ AM_CPPFLAGS = \
 rootbin_PROGRAMS = \
        systemd \
        systemctl \
-       systemd-notify
+       systemd-notify \
+       systemd-ask-password
 
 bin_PROGRAMS = \
        systemd-cgls
 
 if HAVE_GTK
 bin_PROGRAMS += \
-       systemadm
+       systemadm \
+       systemd-ask-password-agent
 endif
 
 rootlibexec_PROGRAMS = \
@@ -75,7 +78,9 @@ rootlibexec_PROGRAMS = \
        systemd-shutdownd \
        systemd-modules-load \
        systemd-remount-api-vfs \
-       systemd-kmsg-syslogd
+       systemd-kmsg-syslogd \
+       systemd-vconsole-setup \
+       systemd-reply-password
 
 noinst_PROGRAMS = \
        test-engine \
@@ -129,6 +134,7 @@ dist_systemunit_DATA = \
        units/network.target \
        units/nss-lookup.target \
        units/mail-transfer-agent.target \
+       units/http-daemon.target \
        units/poweroff.target \
        units/reboot.target \
        units/rescue.target \
@@ -179,6 +185,7 @@ nodist_systemunit_DATA = \
        units/systemd-shutdownd.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
+       units/systemd-vconsole-setup.service \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
@@ -205,6 +212,7 @@ EXTRA_DIST = \
        units/systemd-shutdownd.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
+       units/systemd-vconsole-setup.service.in \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
@@ -230,6 +238,18 @@ dist_systemunit_DATA += \
        units/fedora/plymouth-halt.service
 endif
 
+if TARGET_DEBIAN
+dist_systemunit_DATA += \
+       units/debian/halt.service \
+       units/debian/killall.service \
+       units/debian/poweroff.service \
+       units/debian/reboot.service \
+       units/debian/fsck.target \
+       units/debian/umountfs.service \
+       units/debian/umountnfs.service \
+       units/debian/umountroot.service
+endif
+
 if TARGET_SUSE
 dist_systemunit_DATA += \
        units/suse/halt.service \
@@ -266,6 +286,9 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
+dist_polkitpolicy_DATA = \
+       src/org.freedesktop.systemd1.policy
+
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
        libsystemd-core.la
@@ -327,6 +350,7 @@ libsystemd_core_la_SOURCES = \
        src/hostname-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
+       src/locale-setup.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -581,6 +605,15 @@ systemd_modules_load_CFLAGS = \
 systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
+systemd_vconsole_setup_SOURCES = \
+       src/vconsole-setup.c
+
+systemd_vconsole_setup_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_vconsole_setup_LDADD = \
+       libsystemd-basic.la
+
 systemd_remount_api_vfs_SOURCES = \
        src/remount-api-vfs.c \
        src/mount-setup.c
@@ -639,6 +672,18 @@ systemd_notify_SOURCES = \
 systemd_notify_LDADD = \
        libsystemd-basic.la
 
+systemd_ask_password_SOURCES = \
+       src/ask-password.c
+
+systemd_ask_password_LDADD = \
+       libsystemd-basic.la
+
+systemd_reply_password_SOURCES = \
+       src/reply-password.c
+
+systemd_reply_password_LDADD = \
+       libsystemd-basic.la
+
 systemd_cgls_SOURCES = \
        src/cgls.c \
        src/cgroup-show.c \
@@ -673,6 +718,31 @@ systemadm_LDADD = \
        $(DBUSGLIB_LIBS) \
        $(GTK_LIBS)
 
+systemd_ask_password_agent_SOURCES = \
+       src/ask-password-agent.vala
+
+systemd_ask_password_agent_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUSGLIB_CFLAGS) \
+       $(GTK_CFLAGS) \
+       -Wno-unused-variable \
+       -Wno-unused-function \
+       -Wno-shadow \
+       -Wno-format-nonliteral
+
+systemd_ask_password_agent_VALAFLAGS = \
+       --pkg=dbus-glib-1 \
+       --pkg=posix \
+       --pkg=gtk+-2.0 \
+       --pkg=linux \
+       --pkg=gio-unix-2.0 \
+       --pkg=libnotify \
+       -g
+
+systemd_ask_password_agent_LDADD = \
+       $(DBUSGLIB_LIBS) \
+       $(GTK_LIBS)
+
 pam_systemd_la_SOURCES = \
        src/pam-module.c \
        src/cgroup-util.c \
@@ -952,11 +1022,25 @@ if TARGET_GENTOO
                rm -f xdm.service && \
                $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
+if TARGET_DEBIAN
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/umount.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
+               rm -f umountfs.service umountnfs.service umountroot.service && \
+               $(LN_S) ../umountfs.service umountfs.service && \
+               $(LN_S) ../umountnfs.service umountnfs.service && \
+               $(LN_S) ../umountroot.service umountroot.service )
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f runlevel5.target && \
+               $(LN_S) multi-user.target runlevel5.target )
+endif
 if !TARGET_SUSE
+if !TARGET_DEBIAN
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f fsck.target && \
                $(LN_S) sysinit.target fsck.target )
 endif
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -968,7 +1052,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-rootdir=$$dc_install_base/$(rootdir)
 
 upload: all distcheck
-       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
        scp man/*.html tango:public/systemd-man/