udev: fix keymap mkdir

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4ed1f12dcc64a6715a7343fb4fd615a5b9569083..675e591352b8624e150d0733b5175d3b4bbebde4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,6 +120,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
        -I $(top_srcdir)/src/readahead \
@@ -629,12 +630,13 @@ libsystemd_audit_la_LIBADD = \
        libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
+if HAVE_ACL
 noinst_LTLIBRARIES += \
        libsystemd-acl.la
 
 libsystemd_acl_la_SOURCES = \
-       src/shared/acl.c \
-       src/shared/acl.h
+       src/shared/acl-util.c \
+       src/shared/acl-util.h
 
 libsystemd_acl_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -642,6 +644,7 @@ libsystemd_acl_la_CFLAGS = \
 
 libsystemd_acl_la_LIBADD = \
        $(ACL_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -764,8 +767,7 @@ libsystemd_core_la_SOURCES = \
        src/core/ask-password-api.h \
        src/core/sysfs-show.h \
        src/core/polkit.h \
-       src/core/dbus-loop.h \
-       src/core/spawn-agent.h
+       src/core/dbus-loop.h
 
 nodist_libsystemd_core_la_SOURCES = \
        src/load-fragment-gperf.c \
@@ -1076,7 +1078,10 @@ systemctl_SOURCES = \
        src/cgroup-show.h \
        src/unit-name.c \
        src/install.c \
-       src/spawn-agent.c \
+       src/spawn-ask-password-agent.c \
+       src/spawn-ask-password-agent.h \
+       src/spawn-polkit-agent.c \
+       src/spawn-polkit-agent.h \
        src/logs-show.c \
        src/logs-show.h
 
@@ -1826,7 +1831,7 @@ dist_udevkeymapforcerel_DATA = \
        src/udev/keymap/force-release-maps/common-volume-keys
 
 src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-       $(AM_V_at)mkdir -p src/keymap
+       $(AM_V_at)mkdir -p src/udev/keymap
        $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
@@ -2587,6 +2592,8 @@ loginctl_SOURCES = \
        src/login/loginctl.c \
        src/login/sysfs-show.c \
        src/dbus-common.c \
+       src/spawn-polkit-agent.c \
+       src/spawn-polkit-agent.h \
        src/cgroup-show.c \
        src/cgroup-show.h