X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=3ca0b8030ce9f0d8d8daf7d34f746ca52da703d4;hb=a268a6a38febcb9182cac92aaef8803f2d20d6eb;hp=2a027c38554f0a4aa559c6a9d135418ceeb554f3;hpb=530345e78299951c3a151c93d77e5adbe421bc68;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 2a027c385..3ca0b8030 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS = po
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -116,6 +118,7 @@ endif
 rootbin_PROGRAMS = \
 	systemd \
 	systemctl \
+        systemd-loginctl \
 	systemd-notify \
 	systemd-ask-password \
 	systemd-tty-ask-password-agent \
@@ -353,7 +356,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 += \
@@ -404,6 +408,7 @@ EXTRA_DIST = \
 	units/fsck@.service.in \
 	units/fsck-root.service.in \
 	units/quotacheck.service.in \
+        units/user@.service.in \
 	systemd.pc.in \
 	introspect.awk \
 	src/org.freedesktop.systemd1.policy.in \
@@ -433,6 +438,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 \
@@ -467,11 +478,14 @@ pkgconfigdata_DATA = \
 nodist_polkitpolicy_DATA = \
 	src/org.freedesktop.systemd1.policy
 
-dist_polkitpolicy_DATA = \
-        src/org.freedesktop.hostname1.policy \
-        src/org.freedesktop.locale1.policy \
-        src/org.freedesktop.timedate1.policy \
-        src/org.freedesktop.login1.policy
+dist_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
+
+@INTLTOOL_POLICY_RULE@
+polkitpolicy_DATA = $(dist_polkitpolicy_in_files:.policy.in=.policy)
 
 noinst_LTLIBRARIES = \
 	libsystemd-basic.la \
@@ -877,7 +891,6 @@ 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 \
@@ -897,8 +910,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) \
@@ -1116,7 +1136,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) \
@@ -1127,6 +1148,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
@@ -1175,7 +1214,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)
@@ -1333,6 +1373,7 @@ CLEANFILES = \
 	$(nodist_man_MANS) \
 	${XML_IN_FILES:.xml.in=.html} \
 	$(pkgconfigdata_DATA) \
+	$(polkitpolicy_DATA) \
 	src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC
@@ -1669,6 +1710,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 && \