chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: replace sd_bus_label_{escape,unescape}() by new sd_bus_path_{encode,decode}()
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 251b5d0749a8348132de2555e56f00842777b577..936a78ec8288dbd0b00af240b814347f2a203b6f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-366,6
+366,7
@@
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
+ shell-completion/bash/systemd-cat \
shell-completion/bash/systemd-cgls \
shell-completion/bash/systemd-cgtop \
shell-completion/bash/systemd-delta \
shell-completion/bash/systemd-cgls \
shell-completion/bash/systemd-cgtop \
shell-completion/bash/systemd-delta \
@@
-791,7
+792,10
@@
libsystemd_shared_la_SOURCES = \
src/shared/condition-util.c \
src/shared/condition-util.h \
src/shared/bus-label.c \
src/shared/condition-util.c \
src/shared/condition-util.h \
src/shared/bus-label.c \
- src/shared/bus-label.h
+ src/shared/bus-label.h \
+ src/shared/gpt.h \
+ src/shared/generator.h \
+ src/shared/generator.c
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@
-1835,7
+1839,8
@@
systemgenerator_PROGRAMS += \
systemd-gpt-auto-generator
systemd_gpt_auto_generator_SOURCES = \
systemd-gpt-auto-generator
systemd_gpt_auto_generator_SOURCES = \
- src/gpt-auto-generator/gpt-auto-generator.c
+ src/gpt-auto-generator/gpt-auto-generator.c \
+ src/shared/blkid-util.h
systemd_gpt_auto_generator_LDADD = \
libsystemd-label.la \
systemd_gpt_auto_generator_LDADD = \
libsystemd-label.la \
@@
-1960,14
+1965,16
@@
systemd_nspawn_SOURCES = \
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(BLKID_CFLAGS)
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(BLKID_LIBS)
if HAVE_SECCOMP
systemd_nspawn_LDADD += \
if HAVE_SECCOMP
systemd_nspawn_LDADD += \
@@
-2568,7
+2575,6
@@
dist_network_DATA = \
network/80-container-host0.network
dist_udevrules_DATA += \
network/80-container-host0.network
dist_udevrules_DATA += \
- rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
@@
-2585,6
+2591,9
@@
dist_udevrules_DATA += \
rules/80-net-setup-link.rules \
rules/95-udev-late.rules
rules/80-net-setup-link.rules \
rules/95-udev-late.rules
+nodist_udevrules_DATA += \
+ rules/99-systemd.rules
+
dist_udevhwdb_DATA = \
hwdb/20-pci-vendor-model.hwdb \
hwdb/20-pci-classes.hwdb \
dist_udevhwdb_DATA = \
hwdb/20-pci-vendor-model.hwdb \
hwdb/20-pci-classes.hwdb \
@@
-4971,7
+4980,7
@@
doc-sync: all destdir-sphinx
.PHONY: git-tag
git-tag:
.PHONY: git-tag
git-tag:
- git tag "v$(VERSION)" -m "systemd $(VERSION)"
+ git tag
-s
"v$(VERSION)" -m "systemd $(VERSION)"
.PHONY: install-tree
install-tree: all
.PHONY: install-tree
install-tree: all