X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3ab79ba87595458b782bef35b799d8848cecaba2;hp=55b6dc8519ea084dd0b1a3effcde4121935d645f;hb=5bfcc1c6ef48af20996412dbaac1daa0492a4d41;hpb=a2ff477f6775dcff74e32f7d0221b1b11376e84c

diff --git a/Makefile.am b/Makefile.am
index 55b6dc851..3ab79ba87 100644
--- 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
@@ -53,17 +54,31 @@ AM_CPPFLAGS = \
 	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
 	-I $(top_srcdir)/src
 
+if TARGET_GENTOO
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/bin/setfont\" \
+	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
+endif
+
 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 +90,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 \
@@ -180,6 +197,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 \
@@ -206,6 +224,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 \
@@ -279,6 +298,9 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
 	systemd.pc
 
+dist_polkitpolicy_DATA = \
+	src/org.freedesktop.systemd1.policy
+
 noinst_LTLIBRARIES = \
 	libsystemd-basic.la \
 	libsystemd-core.la
@@ -340,6 +362,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 \
@@ -594,6 +617,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
@@ -652,6 +684,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 \
@@ -686,6 +730,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 \