X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=bfc107950ce761db2f1e7f723dcce49c18abfe56;hb=e9816c4859454d341279f1c9e77df4af4bacd534;hp=7ca0ae858f993182c1dbb3a96e245819da88ea48;hpb=835c60f50c861bce2c4bbcd35d51307a5443b5cf;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 7ca0ae858..bfc107950 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,7 +158,11 @@ rootlibexec_PROGRAMS = \
 	systemd-ac-power \
 	systemd-detect-virt \
 	systemd-sysctl \
-        systemd-hostnamed
+        systemd-hostnamed \
+        systemd-localed \
+        systemd-timedated \
+        systemd-logind \
+        systemd-uaccess
 
 if ENABLE_BINFMT
 rootlibexec_PROGRAMS += \
@@ -197,11 +201,17 @@ dist_pkgsysconf_DATA = \
 
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf \
-        src/org.freedesktop.hostname1.conf
+        src/org.freedesktop.hostname1.conf \
+        src/org.freedesktop.locale1.conf \
+        src/org.freedesktop.timedate1.conf \
+        src/org.freedesktop.login1.conf
 
 dist_dbussystemservice_DATA = \
 	src/org.freedesktop.systemd1.service \
-        src/org.freedesktop.hostname1.service
+        src/org.freedesktop.hostname1.service \
+        src/org.freedesktop.locale1.service \
+        src/org.freedesktop.timedate1.service \
+        src/org.freedesktop.login1.service
 
 dist_udevrules_DATA = \
 	src/99-systemd.rules
@@ -219,7 +229,10 @@ dbusinterface_DATA = \
 	org.freedesktop.systemd1.Automount.xml \
 	org.freedesktop.systemd1.Snapshot.xml \
 	org.freedesktop.systemd1.Swap.xml \
-	org.freedesktop.systemd1.Path.xml
+	org.freedesktop.systemd1.Path.xml \
+        org.freedesktop.hostname1.xml \
+        org.freedesktop.locale1.xml \
+        org.freedesktop.timedate1.xml
 
 dist_bashcompletion_DATA = \
 	src/systemctl-bash-completion.sh
@@ -306,6 +319,9 @@ nodist_systemunit_DATA = \
 	units/systemd-logger.service \
 	units/systemd-shutdownd.service \
 	units/systemd-hostnamed.service \
+	units/systemd-localed.service \
+	units/systemd-timedated.service \
+	units/systemd-logind.service \
 	units/systemd-kmsg-syslogd.service \
 	units/systemd-modules-load.service \
 	units/systemd-vconsole-setup.service \
@@ -353,6 +369,9 @@ EXTRA_DIST = \
 	units/systemd-logger.service.in \
 	units/systemd-shutdownd.service.in \
 	units/systemd-hostnamed.service.in \
+	units/systemd-localed.service.in \
+	units/systemd-timedated.service.in \
+	units/systemd-logind.service.in \
 	units/systemd-kmsg-syslogd.service.in \
 	units/systemd-modules-load.service.in \
 	units/systemd-vconsole-setup.service.in \
@@ -441,7 +460,10 @@ nodist_polkitpolicy_DATA = \
 	src/org.freedesktop.systemd1.policy
 
 dist_polkitpolicy_DATA = \
-        src/org.freedesktop.hostname1.policy
+        src/org.freedesktop.hostname1.policy \
+        src/org.freedesktop.locale1.policy \
+        src/org.freedesktop.timedate1.policy \
+        src/org.freedesktop.login1.policy
 
 noinst_LTLIBRARIES = \
 	libsystemd-basic.la \
@@ -795,7 +817,8 @@ systemd_shutdownd_LDADD = \
 
 systemd_hostnamed_SOURCES = \
 	src/hostnamed.c \
-        src/dbus-common.c
+        src/dbus-common.c \
+        src/polkit.c
 
 systemd_hostnamed_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -806,6 +829,76 @@ systemd_hostnamed_LDADD = \
 	libsystemd-daemon.la \
 	$(DBUS_LIBS)
 
+systemd_localed_SOURCES = \
+	src/localed.c \
+        src/dbus-common.c \
+        src/polkit.c
+
+systemd_localed_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_localed_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(DBUS_LIBS)
+
+systemd_timedated_SOURCES = \
+	src/timedated.c \
+        src/dbus-common.c \
+        src/polkit.c
+
+systemd_timedated_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_timedated_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(DBUS_LIBS)
+
+systemd_logind_SOURCES = \
+	src/logind.c \
+	src/logind-dbus.c \
+        src/logind-device.c \
+        src/logind-seat.c \
+        src/logind-seat-dbus.c \
+        src/logind-session.c \
+        src/logind-session-dbus.c \
+        src/logind-user.c \
+        src/logind-user-dbus.c \
+        src/logind-acl.c \
+        src/dbus-common.c \
+        src/dbus-loop.c \
+        src/cgroup-util.c
+
+systemd_logind_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+        $(UDEV_CFLAGS) \
+        $(ACL_CFLAGS)
+
+systemd_logind_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la \
+	$(DBUS_LIBS) \
+        $(UDEV_LIBS) \
+        $(ACL_LIBS)
+
+systemd_uaccess_SOURCES = \
+	src/uaccess.c \
+        src/logind-acl.c
+
+systemd_uaccess_CFLAGS = \
+	$(AM_CFLAGS) \
+        $(UDEV_CFLAGS) \
+        $(ACL_CFLAGS)
+
+systemd_uaccess_LDADD = \
+	libsystemd-basic.la \
+        $(UDEV_LIBS) \
+        $(ACL_LIBS)
+
 systemd_shutdown_SOURCES = \
 	src/mount-setup.c \
 	src/umount.c \
@@ -1155,10 +1248,12 @@ systemd_tty_ask_password_agent_LDADD = \
 
 pam_systemd_la_SOURCES = \
 	src/pam-module.c \
-	src/cgroup-util.c
+        src/dbus-common.c
 
 pam_systemd_la_CFLAGS = \
-	$(AM_CFLAGS)
+	$(AM_CFLAGS) \
+        $(PAM_CFLAGS) \
+        $(DBUS_CFLAGS) \
 	-fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -1171,7 +1266,8 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
-	$(PAM_LIBS)
+	$(PAM_LIBS) \
+        $(DBUS_LIBS)
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1303,6 +1399,21 @@ org.freedesktop.systemd1.%.xml: systemd
 		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
 		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
+org.freedesktop.hostname1.xml: systemd-hostnamed
+	$(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
+		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+org.freedesktop.locale1.xml: systemd-localed
+	$(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
+		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+org.freedesktop.timedate1.xml: systemd-timedated
+	$(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
+		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
 CLEANFILES += \
 	$(dbusinterface_DATA)
 
@@ -1402,10 +1513,13 @@ endif
 		$(LN_S) graphical.target runlevel5.target && \
 		$(LN_S) reboot.target runlevel6.target )
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service && \
+		rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service && \
 		$(LN_S) graphical.target default.target && \
 		$(LN_S) reboot.target ctrl-alt-del.target && \
-                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service && \
+                $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service && \
+                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service && \
+                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service )
 	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
 		rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
 		$(LN_S) ../getty.target getty.target && \