X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=445cc1e37e35d7c11186809bc8d2769ff7544929;hb=74b91131ed09850ed487a2f7849147ff6f80194d;hp=a2d7397567a0052ebad997ba5b912466eb6a0175;hpb=91f9dcaf9270fe465525638cc08bd94590273349;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index a2d739756..445cc1e37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,12 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS = po
+
+LIBSYSTEMD_LOGIN_CURRENT=0
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=0
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -33,6 +39,7 @@ pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
+pkgincludedir=$(includedir)/systemd
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -116,6 +123,7 @@ endif
 rootbin_PROGRAMS = \
 	systemd \
 	systemctl \
+        systemd-loginctl \
 	systemd-notify \
 	systemd-ask-password \
 	systemd-tty-ask-password-agent \
@@ -180,6 +188,12 @@ systemgenerator_PROGRAMS += \
 	systemd-cryptsetup-generator
 endif
 
+lib_LTLIBRARIES = \
+        libsystemd-login.la
+
+pkginclude_HEADERS = \
+        src/sd-login.h
+
 noinst_PROGRAMS = \
 	test-engine \
 	test-job-type \
@@ -189,7 +203,8 @@ noinst_PROGRAMS = \
 	test-daemon \
 	test-cgroup \
 	test-env-replace \
-	test-strv
+	test-strv \
+        test-login
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -197,7 +212,9 @@ pamlib_LTLIBRARIES = \
 endif
 
 dist_pkgsysconf_DATA = \
-	src/system.conf
+	src/system.conf \
+        src/user.conf \
+        src/systemd-logind.conf
 
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf \
@@ -214,8 +231,13 @@ dist_dbussystemservice_DATA = \
         src/org.freedesktop.login1.service
 
 dist_udevrules_DATA = \
+        src/70-uaccess.rules \
+        src/71-seat.rules \
 	src/99-systemd.rules
 
+nodist_udevrules_DATA = \
+        src/73-seat-late.rules
+
 dbusinterface_DATA = \
 	org.freedesktop.systemd1.Manager.xml \
 	org.freedesktop.systemd1.Job.xml \
@@ -346,7 +368,8 @@ nodist_systemunit_DATA = \
 	units/fsck@.service \
 	units/fsck-root.service \
 	units/quotacheck.service \
-	units/rescue.service
+	units/rescue.service \
+        units/user@.service
 
 if ENABLE_BINFMT
 nodist_systemunit_DATA += \
@@ -397,9 +420,11 @@ EXTRA_DIST = \
 	units/fsck@.service.in \
 	units/fsck-root.service.in \
 	units/quotacheck.service.in \
+        units/user@.service.in \
 	systemd.pc.in \
+        libsystemd-login.pc.in \
 	introspect.awk \
-	src/org.freedesktop.systemd1.policy.in
+        src/73-seat-late.rules.in
 
 if ENABLE_BINFMT
 EXTRA_DIST += \
@@ -425,6 +450,12 @@ dist_systemunit_DATA += \
 	units/frugalware/display-manager.service
 endif
 
+if TARGET_SUSE
+dist_systemunit_DATA += \
+	units/suse/rc-local.service \
+	units/suse/halt-local.service
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
 	units/plymouth-start.service \
@@ -454,16 +485,29 @@ dist_doc_DATA = \
 	src/sd-readahead.c
 
 pkgconfigdata_DATA = \
-	systemd.pc
+	systemd.pc \
+        libsystemd-login.pc
+
+# Passed through intltool only
+polkitpolicy_in_files = \
+        src/org.freedesktop.hostname1.policy.in \
+        src/org.freedesktop.locale1.policy.in \
+        src/org.freedesktop.timedate1.policy.in \
+        src/org.freedesktop.login1.policy.in
+
+# First passed through sed, followed by intltool
+polkitpolicy_in_in_files = \
+	src/org.freedesktop.systemd1.policy.in.in
 
 nodist_polkitpolicy_DATA = \
-	src/org.freedesktop.systemd1.policy
+        $(polkitpolicy_in_files:.policy.in=.policy) \
+        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+
+EXTRA_DIST += \
+        $(polkitpolicy_in_files) \
+        $(polkitpolicy_in_in_files)
 
-dist_polkitpolicy_DATA = \
-        src/org.freedesktop.hostname1.policy \
-        src/org.freedesktop.locale1.policy \
-        src/org.freedesktop.timedate1.policy \
-        src/org.freedesktop.login1.policy
+@INTLTOOL_POLICY_RULE@
 
 noinst_LTLIBRARIES = \
 	libsystemd-basic.la \
@@ -538,7 +582,8 @@ libsystemd_core_la_SOURCES = \
 	src/tcpwrap.c \
 	src/cgroup-util.c \
 	src/condition.c \
-        src/dbus-common.c
+        src/dbus-common.c \
+        src/sd-daemon.c
 
 libsystemd_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -585,7 +630,17 @@ EXTRA_DIST += \
 	src/shutdownd.h \
 	src/umount.h \
 	src/readahead-common.h \
-	src/ask-password-api.h
+	src/ask-password-api.h \
+        src/pager.h \
+        src/sysfs-show.h \
+        src/polkit.h \
+        src/logind.h \
+        src/logind-device.h \
+        src/logind-seat.h \
+        src/logind-session.h \
+        src/logind-user.h \
+        src/logind-acl.h \
+        src/dbus-loop.h
 
 MANPAGES = \
 	man/systemd.1 \
@@ -621,6 +676,7 @@ MANPAGES = \
 	man/shutdown.8 \
 	man/pam_systemd.8 \
 	man/systemd.conf.5 \
+	man/systemd-logind.conf.5 \
 	man/tmpfiles.d.5 \
 	man/hostname.5 \
 	man/machine-id.5 \
@@ -630,7 +686,8 @@ MANPAGES = \
         man/machine-info.5 \
 	man/modules-load.d.5 \
 	man/sysctl.d.5 \
-        man/systemd-ask-password.1
+        man/systemd-ask-password.1 \
+        man/systemd-loginctl.1
 
 if ENABLE_BINFMT
 MANPAGES += \
@@ -758,6 +815,16 @@ test_strv_CFLAGS = \
 test_strv_LDADD = \
 	libsystemd-basic.la
 
+test_login_SOURCES = \
+	src/test-login.c
+
+test_login_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_login_LDADD = \
+	libsystemd-basic.la \
+        libsystemd-login.la
+
 systemd_logger_SOURCES = \
 	src/logger.c \
 	src/tcpwrap.c
@@ -867,10 +934,10 @@ systemd_logind_SOURCES = \
         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
+        src/cgroup-util.c \
+        src/polkit.c
 
 systemd_logind_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -886,8 +953,15 @@ systemd_logind_LDADD = \
         $(ACL_LIBS)
 
 systemd_uaccess_SOURCES = \
-	src/uaccess.c \
-        src/logind-acl.c
+	src/uaccess.c
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+	src/logind-acl.c
+
+systemd_uaccess_SOURCES += \
+	src/logind-acl.c
+endif
 
 systemd_uaccess_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -896,6 +970,7 @@ systemd_uaccess_CFLAGS = \
 
 systemd_uaccess_LDADD = \
 	libsystemd-basic.la \
+	libsystemd-daemon.la \
         $(UDEV_LIBS) \
         $(ACL_LIBS)
 
@@ -1105,7 +1180,8 @@ systemctl_SOURCES = \
 	src/cgroup-show.c \
 	src/cgroup-util.c \
 	src/exit-status.c \
-	src/unit-name.c
+	src/unit-name.c \
+        src/pager.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1116,6 +1192,24 @@ systemctl_LDADD = \
 	libsystemd-daemon.la \
 	$(DBUS_LIBS)
 
+systemd_loginctl_SOURCES = \
+	src/loginctl.c \
+	src/dbus-common.c \
+	src/cgroup-show.c \
+	src/cgroup-util.c \
+        src/pager.c \
+        src/sysfs-show.c
+
+systemd_loginctl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS) \
+        $(UDEV_CFLAGS)
+
+systemd_loginctl_LDADD = \
+	libsystemd-basic.la \
+	$(DBUS_LIBS) \
+        $(UDEV_LIBS)
+
 systemd_notify_SOURCES = \
 	src/notify.c \
 	src/sd-readahead.c
@@ -1164,7 +1258,8 @@ systemd_readahead_replay_LDADD = \
 systemd_cgls_SOURCES = \
 	src/cgls.c \
 	src/cgroup-show.c \
-	src/cgroup-util.c
+	src/cgroup-util.c \
+        src/pager.c
 
 systemd_cgls_CFLAGS = \
 	$(AM_CFLAGS)
@@ -1248,10 +1343,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 = \
@@ -1264,7 +1361,23 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
-	$(PAM_LIBS)
+	$(PAM_LIBS) \
+        $(DBUS_LIBS)
+
+libsystemd_login_la_CFLAGS = \
+        $(AM_CFLAGS) \
+	-fvisibility=hidden
+
+libsystemd_login_la_LDFLAGS = \
+        -shared \
+        -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE)
+
+libsystemd_login_la_SOURCES = \
+        src/sd-login.c \
+        src/cgroup-util.c
+
+libsystemd_login_la_LIBADD = \
+	libsystemd-basic.la
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1282,6 +1395,9 @@ SED_PROCESS = \
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
 		-e 's,@prefix\@,$(prefix),g' \
+		-e 's,@exec_prefix\@,$(exec_prefix),g' \
+		-e 's,@libdir\@,$(libdir),g' \
+		-e 's,@includedir\@,$(includedir),g' \
 		< $< > $@ || rm $@
 
 units/%: units/%.in Makefile
@@ -1293,7 +1409,10 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
 	$(SED_PROCESS)
 
-src/%.policy: src/%.policy.in Makefile
+src/%.policy.in: src/%.policy.in.in Makefile
+	$(SED_PROCESS)
+
+src/%.rules: src/%.rules.in Makefile
 	$(SED_PROCESS)
 
 M4_PROCESS_SYSTEM = \
@@ -1316,7 +1435,8 @@ CLEANFILES = \
 	$(nodist_man_MANS) \
 	${XML_IN_FILES:.xml.in=.html} \
 	$(pkgconfigdata_DATA) \
-	src/org.freedesktop.systemd1.policy
+	$(nodist_polkitpolicy_DATA) \
+        src/73-seat-late.rules
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1510,26 +1630,23 @@ 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 autovt@.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-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 )
+                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
+                $(LN_S) getty@.service autovt@.service )
 	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-		rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
+		rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path systemd-logind.service && \
 		$(LN_S) ../getty.target getty.target && \
 		$(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
-		$(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path )
+		$(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path && \
+                $(LN_S) ../systemd-logind.service systemd-logind.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-		rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
-		$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
-		$(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \
-		$(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \
-		$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
-		$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
-		$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
+		rm -f getty@tty1.service && \
+		$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f remote-fs.target && \
 		$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
@@ -1655,6 +1772,19 @@ if TARGET_DEBIAN_OR_UBUNTU
 		$(LN_S) multi-user.target runlevel5.target )
 endif
 
+if TARGET_SUSE
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f rc-local.service && \
+		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f local.service && \
+		$(LN_S) rc-local.service local.service )
+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+		rm -f halt-local.service && \
+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+endif
+
 if HAVE_SYSV_COMPAT
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
 		rm -f var-lock.mount && \