Merge remote-tracking branch 'harald/master'

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 78e5caf35bbcede78c6fc9d1e63bf656857ea654..ca2c43773aa05ec08eb4d6cd69749657787ae9be 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS = po
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -470,11 +472,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 \
@@ -880,7 +885,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 \
@@ -900,8 +904,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) \
@@ -1136,15 +1147,18 @@ systemd_loginctl_SOURCES = \
        src/dbus-common.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
-        src/pager.c
+        src/pager.c \
+        src/sysfs-show.c
 
 systemd_loginctl_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       $(DBUS_CFLAGS) \
+        $(UDEV_CFLAGS)
 
 systemd_loginctl_LDADD = \
        libsystemd-basic.la \
-       $(DBUS_LIBS)
+       $(DBUS_LIBS) \
+        $(UDEV_LIBS)
 
 systemd_notify_SOURCES = \
        src/notify.c \
@@ -1353,6 +1367,7 @@ CLEANFILES = \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \
+       $(polkitpolicy_DATA) \
        src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC