chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: ship missing unit file
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d9cc5f0f96e9f53b8e558ea17b5cad06bc9476ba..d5eb7ad6dbc73e767cfb069eacc8308e8ecd7e0f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-193,8
+193,8
@@
SHUTDOWN_TARGET_WANTS =
LOCAL_FS_TARGET_WANTS =
MULTI_USER_TARGET_WANTS =
SYSINIT_TARGET_WANTS =
LOCAL_FS_TARGET_WANTS =
MULTI_USER_TARGET_WANTS =
SYSINIT_TARGET_WANTS =
-BASIC_TARGET_WANTS =
SOCKETS_TARGET_WANTS =
SOCKETS_TARGET_WANTS =
+TIMERS_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
@@
-211,8
+211,8
@@
install-target-wants-hook:
what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
- what="$(BASIC_TARGET_WANTS)" && wants=basic.target && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
+ what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
define add-wants
[ -z "$$what" ] || ( \
define add-wants
[ -z "$$what" ] || ( \
@@
-355,6
+355,7
@@
dist_systemunit_DATA = \
units/initrd-root-fs.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/initrd-root-fs.target \
units/remote-fs.target \
units/remote-fs-pre.target \
+ units/remote-fs-setup.target \
units/network.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/network.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
@@
-371,6
+372,8
@@
dist_systemunit_DATA = \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
+ units/timers.target \
+ units/paths.target \
units/suspend.target \
units/swap.target \
units/systemd-initctl.socket \
units/suspend.target \
units/swap.target \
units/systemd-initctl.socket \
@@
-793,7
+796,8
@@
libsystemd_acl_la_CFLAGS = \
$(ACL_CFLAGS)
libsystemd_acl_la_LIBADD = \
$(ACL_CFLAGS)
libsystemd_acl_la_LIBADD = \
- $(ACL_LIBS)
+ $(ACL_LIBS) \
+ libsystemd-shared.la
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-1660,6
+1664,8
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-error.h \
src/libsystemd-bus/bus-internal.c \
src/libsystemd-bus/bus-internal.h \
src/libsystemd-bus/bus-error.h \
src/libsystemd-bus/bus-internal.c \
src/libsystemd-bus/bus-internal.h \
+ src/libsystemd-bus/bus-socket.c \
+ src/libsystemd-bus/bus-socket.h \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
@@
-1668,7
+1674,8
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-type.h
libsystemd_bus_la_LIBADD = \
src/libsystemd-bus/bus-type.h
libsystemd_bus_la_LIBADD = \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
@@
-1831,9
+1838,9
@@
dist_udevrules_DATA += \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
- hwdb/20-pci-vendor-
product
.hwdb \
+ hwdb/20-pci-vendor-
model
.hwdb \
hwdb/20-pci-classes.hwdb \
hwdb/20-pci-classes.hwdb \
- hwdb/20-usb-vendor-
product
.hwdb \
+ hwdb/20-usb-vendor-
model
.hwdb \
hwdb/20-usb-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-usb-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
@@
-2502,6
+2509,11
@@
journalctl_LDADD = \
libsystemd-id128-internal.la \
libsystemd-logs.la
libsystemd-id128-internal.la \
libsystemd-logs.la
+if HAVE_ACL
+journalctl_LDADD += \
+ libsystemd-acl.la
+endif
+
if HAVE_QRENCODE
journalctl_SOURCES += \
src/journal/journal-qrcode.c \
if HAVE_QRENCODE
journalctl_SOURCES += \
src/journal/journal-qrcode.c \
@@
-3725,7
+3737,8
@@
SED_PROCESS = \
-e 's,@VERSION\@,$(VERSION),g' \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-e 's,@VERSION\@,$(VERSION),g' \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
- -e 's,@sushell\@,$(sushell),g' \
+ -e 's,@SUSHELL\@,$(SUSHELL),g' \
+ -e 's,@DEBUGTTY\@,$(DEBUGTTY),g' \
-e 's,@KILL\@,$(KILL),g' \
-e 's,@QUOTAON\@,$(QUOTAON),g' \
-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
-e 's,@KILL\@,$(KILL),g' \
-e 's,@QUOTAON\@,$(QUOTAON),g' \
-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
@@
-3906,7
+3919,7
@@
SYSINIT_TARGET_WANTS += \
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-ask-password-console.path
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-ask-password-console.path
-
BASIC
_TARGET_WANTS += \
+
TIMERS
_TARGET_WANTS += \
systemd-tmpfiles-clean.timer
if HAVE_SYSV_COMPAT
systemd-tmpfiles-clean.timer
if HAVE_SYSV_COMPAT
@@
-3928,9
+3941,12
@@
SYSTEM_UNIT_ALIASES += \
USER_UNIT_ALIASES += \
$(systemunitdir)/shutdown.target shutdown.target \
$(systemunitdir)/sockets.target sockets.target \
USER_UNIT_ALIASES += \
$(systemunitdir)/shutdown.target shutdown.target \
$(systemunitdir)/sockets.target sockets.target \
+ $(systemunitdir)/timers.target timers.target \
+ $(systemunitdir)/paths.target paths.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
$(systemunitdir)/printer.target printer.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
$(systemunitdir)/printer.target printer.target \
- $(systemunitdir)/sound.target sound.target
+ $(systemunitdir)/sound.target sound.target \
+ $(systemunitdir)/smartcard.target smartcard.target
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
@@
-3954,6
+3970,8
@@
INSTALL_DIRS += \
$(sysconfdir)/modules-load.d \
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
$(sysconfdir)/modules-load.d \
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
+ $(prefix)/lib/kernel/install.d \
+ $(sysconfdir)/kernel/install.d \
$(systemshutdowndir) \
$(systemsleepdir) \
$(systemgeneratordir) \
$(systemshutdowndir) \
$(systemsleepdir) \
$(systemgeneratordir) \