chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-booted: update sd_booted() check a bit
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3073b0df84b8d857edb6ebd4ca764216d03ba5db..f687eca0cc2b7736293fc5957e31bc7f645f749b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-330,6
+330,9
@@
dist_tmpfiles_DATA = \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf
+dist_sysctl_DATA = \
+ sysctl.d/50-default.conf
+
if HAVE_SYSV_COMPAT
dist_tmpfiles_DATA += \
tmpfiles.d/legacy.conf
if HAVE_SYSV_COMPAT
dist_tmpfiles_DATA += \
tmpfiles.d/legacy.conf
@@
-347,8
+350,9
@@
dist_systemunit_DATA = \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
+ units/initrd.target \
units/initrd-fs.target \
units/initrd-fs.target \
- units/root-fs.target \
+ units/
initrd-
root-fs.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
@@
-471,8
+475,7
@@
EXTRA_DIST += \
units/initrd-cleanup.service.in \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
units/initrd-cleanup.service.in \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
- introspect.awk \
- man/custom-html.xsl
+ introspect.awk
CLEANFILES += \
units/console-shell.service.m4 \
CLEANFILES += \
units/console-shell.service.m4 \
@@
-2776,14
+2779,14
@@
dist_bashcompletion_DATA += \
shell-completion/bash/systemd-coredumpctl
sysctl_DATA = \
shell-completion/bash/systemd-coredumpctl
sysctl_DATA = \
- sysctl.d/coredump.conf
+ sysctl.d/
50-
coredump.conf
CLEANFILES += \
CLEANFILES += \
- sysctl.d/coredump.conf
+ sysctl.d/
50-
coredump.conf
endif
EXTRA_DIST += \
endif
EXTRA_DIST += \
- sysctl.d/coredump.conf.in
+ sysctl.d/
50-
coredump.conf.in
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
@@
-2882,7
+2885,8
@@
systemd_bootchart_SOURCES = \
src/bootchart/bootchart.h \
src/bootchart/store.c \
src/bootchart/store.h \
src/bootchart/bootchart.h \
src/bootchart/store.c \
src/bootchart/store.h \
- src/bootchart/svg.c
+ src/bootchart/svg.c \
+ src/bootchart/svg.h
systemd_bootchart_LDADD = \
libsystemd-shared.la
systemd_bootchart_LDADD = \
libsystemd-shared.la
@@
-3356,7
+3360,8
@@
libsystemd_login_la_LDFLAGS = \
-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
libsystemd_login_la_LIBADD = \
-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
libsystemd_login_la_LIBADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon-internal.la
libsystemd_login_internal_la_SOURCES = \
$(libsystemd_login_la_SOURCES)
libsystemd_login_internal_la_SOURCES = \
$(libsystemd_login_la_SOURCES)
@@
-3718,6
+3723,10
@@
endef
endif
endif
+EXTRA_DIST += \
+ man/custom-html.xsl \
+ man/custom-man.xsl
+
# ------------------------------------------------------------------------------
DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
# ------------------------------------------------------------------------------
DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h