chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: brutally slaughter processes that are running in the cgroup when we enter...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index bd7eb5c5ddf834ca39bb867ecad2dc5571a70e7e..2279ff48c05f07ba7ef9ef3a156765bd48b02376 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-366,7
+366,7
@@
EXTRA_DIST += \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
- systemd.pc.in \
+ s
rc/s
ystemd.pc.in \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
@@
-437,7
+437,7
@@
dist_doc_DATA = \
DISTRO_PORTING
pkgconfigdata_DATA = \
DISTRO_PORTING
pkgconfigdata_DATA = \
- systemd.pc
+ s
rc/s
ystemd.pc
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
@@
-974,6
+974,7
@@
systemctl_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-journal.la \
libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-journal.la \
+ libsystemd-id128.la \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
@@
-1115,7
+1116,7
@@
lib_LTLIBRARIES += \
libsystemd-daemon.la
pkgconfiglib_DATA += \
libsystemd-daemon.la
pkgconfiglib_DATA += \
- libsystemd-daemon.pc
+
src/
libsystemd-daemon.pc
MANPAGES += \
man/sd-daemon.7 \
MANPAGES += \
man/sd-daemon.7 \
@@
-1138,7
+1139,7
@@
man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
- libsystemd-daemon.pc.in \
+
src/
libsystemd-daemon.pc.in \
src/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
src/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
@@
-1174,7
+1175,7
@@
lib_LTLIBRARIES += \
libsystemd-id128.la
pkgconfiglib_DATA += \
libsystemd-id128.la
pkgconfiglib_DATA += \
- libsystemd-id128.pc
+
src/
libsystemd-id128.pc
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
@@
-1196,7
+1197,7
@@
UNINSTALL_EXEC_HOOKS += \
libsystemd-id128-uninstall-hook
EXTRA_DIST += \
libsystemd-id128-uninstall-hook
EXTRA_DIST += \
- libsystemd-id128.pc.in \
+
src/
libsystemd-id128.pc.in \
src/libsystemd-id128.sym
# ------------------------------------------------------------------------------
src/libsystemd-id128.sym
# ------------------------------------------------------------------------------
@@
-1239,7
+1240,8
@@
systemd_journalctl_SOURCES = \
systemd_journalctl_LDADD = \
libsystemd-basic.la \
systemd_journalctl_LDADD = \
libsystemd-basic.la \
- libsystemd-journal.la
+ libsystemd-journal.la \
+ libsystemd-id128.la
if HAVE_XZ
systemd_journalctl_SOURCES += \
if HAVE_XZ
systemd_journalctl_SOURCES += \
@@
-1353,10
+1355,14
@@
pkgconfiglib_DATA += \
journal-install-data-hook:
$(MKDIR_P) -m 0755 \
journal-install-data-hook:
$(MKDIR_P) -m 0755 \
- $(DESTDIR)$(systemunitdir)/sockets.target.wants
+ $(DESTDIR)$(systemunitdir)/sockets.target.wants \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-journald.socket && \
$(LN_S) ../systemd-journald.socket )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-journald.socket && \
$(LN_S) ../systemd-journald.socket )
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+ rm -f systemd-journald.service && \
+ $(LN_S) ../systemd-journald.service )
INSTALL_DATA_HOOKS += \
journal-install-data-hook
INSTALL_DATA_HOOKS += \
journal-install-data-hook