chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machinectl: fix handling of --verify= argument for dkr downloads
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e86075f23a0f70b91605cff9aa4ca19a631058ad..2b7ee6f4789541d41eb6f06f374c0040bbdb3539 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2193,6
+2193,11
@@
systemd_tmpfiles_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
+if HAVE_ACL
+systemd_tmpfiles_LDADD += \
+ libsystemd-acl.la
+endif
+
rootbin_PROGRAMS += \
systemd-tmpfiles
rootbin_PROGRAMS += \
systemd-tmpfiles
@@
-5268,24
+5273,21
@@
if HAVE_GCRYPT
rootlibexec_PROGRAMS += \
systemd-importd \
rootlibexec_PROGRAMS += \
systemd-importd \
- systemd-
import
+ systemd-
pull
systemd_importd_SOURCES = \
systemd_importd_SOURCES = \
- src/import/importd.c \
- src/import/importd.h
+ src/import/importd.c
systemd_importd_CFLAGS = \
$(AM_CFLAGS) \
systemd_importd_CFLAGS = \
$(AM_CFLAGS) \
- -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
- -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
- -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
+ -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\"
systemd_importd_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
systemd_importd_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
-systemd_
import
_SOURCES = \
- src/import/
import
.c \
+systemd_
pull
_SOURCES = \
+ src/import/
pull
.c \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import-tar.c \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import-tar.c \
@@
-5303,7
+5305,7
@@
systemd_import_SOURCES = \
src/import/qcow2-util.c \
src/import/qcow2-util.h
src/import/qcow2-util.c \
src/import/qcow2-util.h
-systemd_
import
_CFLAGS = \
+systemd_
pull
_CFLAGS = \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(XZ_CFLAGS) \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(XZ_CFLAGS) \
@@
-5312,7
+5314,7
@@
systemd_import_CFLAGS = \
-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
-systemd_
import
_LDADD = \
+systemd_
pull
_LDADD = \
libsystemd-internal.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-internal.la \
libsystemd-label.la \
libsystemd-shared.la \