chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
split selinux label operations out of cgroup-util, socket-util
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 353ee95131d5834980ddfb37cc718ec5a8d1a820..07b30ebd1e16ddba8447f1ffc92f770ca5bcedcc 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-290,6
+290,7
@@
dist_systemunit_DATA = \
units/remote-fs-pre.target \
units/network.target \
units/nss-lookup.target \
units/remote-fs-pre.target \
units/network.target \
units/nss-lookup.target \
+ units/nss-user-lookup.target \
units/mail-transfer-agent.target \
units/http-daemon.target \
units/poweroff.target \
units/mail-transfer-agent.target \
units/http-daemon.target \
units/poweroff.target \
@@
-517,10
+518,7
@@
MANPAGES = \
man/systemd-cat.1 \
man/systemd-machine-id-setup.1 \
man/journald.conf.5 \
man/systemd-cat.1 \
man/systemd-machine-id-setup.1 \
man/journald.conf.5 \
- man/journalctl.1 \
- man/udev.7 \
- man/udevadm.8 \
- man/udevd.8
+ man/journalctl.1
MANPAGES_ALIAS = \
man/reboot.8 \
MANPAGES_ALIAS = \
man/reboot.8 \
@@
-551,15
+549,13
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
-libsystemd_
basic
_la_SOURCES = \
+libsystemd_
shared
_la_SOURCES = \
src/shared/util.c \
src/shared/util.h \
src/shared/virt.c \
src/shared/virt.h \
src/shared/util.c \
src/shared/util.h \
src/shared/virt.c \
src/shared/virt.h \
- src/shared/label.c \
- src/shared/label.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/set.c \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/set.c \
@@
-568,8
+564,6
@@
libsystemd_basic_la_SOURCES = \
src/shared/strv.h \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
src/shared/strv.h \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
- src/shared/socket-util.c \
- src/shared/socket-util.h \
src/shared/log.c \
src/shared/log.h \
src/shared/ratelimit.h \
src/shared/log.c \
src/shared/log.h \
src/shared/ratelimit.h \
@@
-578,14
+572,33
@@
libsystemd_basic_la_SOURCES = \
src/shared/exit-status.h \
src/shared/utf8.c \
src/shared/utf8.h \
src/shared/exit-status.h \
src/shared/utf8.c \
src/shared/utf8.h \
+ src/shared/pager.c \
+ src/shared/pager.h \
+ src/shared/ioprio.h \
+ src/shared/socket-util.c \
+ src/shared/socket-util.h \
src/shared/cgroup-util.c \
src/shared/cgroup-util.c \
- src/shared/cgroup-util.h
+ src/shared/cgroup-util.h \
+ src/shared/list.h \
+ src/shared/macro.h
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-label.la
-libsystemd_basic_la_CFLAGS = \
+libsystemd_label_la_SOURCES = \
+ src/shared/cgroup-label.c \
+ src/shared/socket-label.c \
+ src/shared/label.c \
+ src/shared/label.h \
+ src/shared/mkdir.c \
+ src/shared/mkdir.h
+
+libsystemd_label_la_CFLAGS = \
$(AM_CFLAGS) \
$(SELINUX_CFLAGS)
$(AM_CFLAGS) \
$(SELINUX_CFLAGS)
-libsystemd_
basic
_la_LIBADD = \
+libsystemd_
label
_la_LIBADD = \
$(SELINUX_LIBS)
# ------------------------------------------------------------------------------
$(SELINUX_LIBS)
# ------------------------------------------------------------------------------
@@
-738,13
+751,8
@@
libsystemd_core_la_SOURCES = \
src/cgroup-attr.h \
src/watchdog.c \
src/watchdog.h \
src/cgroup-attr.h \
src/watchdog.c \
src/watchdog.h \
- src/sd-daemon.c \
- src/sd-id128.c \
- src/macro.h \
src/def.h \
src/def.h \
- src/ioprio.h \
src/missing.h \
src/missing.h \
- src/list.h \
src/securebits.h \
src/linux/auto_dev-ioctl.h \
src/linux/fanotify.h \
src/securebits.h \
src/linux/auto_dev-ioctl.h \
src/linux/fanotify.h \
@@
-754,10
+762,8
@@
libsystemd_core_la_SOURCES = \
src/bus-errors.h \
src/cgroup-show.h \
src/build.h \
src/bus-errors.h \
src/cgroup-show.h \
src/build.h \
- src/shutdownd.h \
src/umount.h \
src/ask-password-api.h \
src/umount.h \
src/ask-password-api.h \
- src/pager.h \
src/sysfs-show.h \
src/polkit.h \
src/dbus-loop.h \
src/sysfs-show.h \
src/polkit.h \
src/dbus-loop.h \
@@
-780,8
+786,9
@@
libsystemd_core_la_CFLAGS = \
$(KMOD_CFLAGS)
libsystemd_core_la_LIBADD = \
$(KMOD_CFLAGS)
libsystemd_core_la_LIBADD = \
- libsystemd-basic.la \
libsystemd-capability.la \
libsystemd-capability.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libudev.la \
$(DBUS_LIBS) \
$(LIBWRAP_LIBS) \
libudev.la \
$(DBUS_LIBS) \
$(LIBWRAP_LIBS) \
@@
-799,7
+806,9
@@
systemd_CFLAGS = \
$(DBUS_CFLAGS)
systemd_LDADD = \
$(DBUS_CFLAGS)
systemd_LDADD = \
- libsystemd-core.la
+ libsystemd-core.la \
+ libsystemd-daemon.la \
+ libsystemd-id128.la
# ------------------------------------------------------------------------------
test_engine_SOURCES = \
# ------------------------------------------------------------------------------
test_engine_SOURCES = \
@@
-810,7
+819,8
@@
test_engine_CFLAGS = \
$(DBUS_CFLAGS)
test_engine_LDADD = \
$(DBUS_CFLAGS)
test_engine_LDADD = \
- libsystemd-core.la
+ libsystemd-core.la \
+ libsystemd-daemon.la
test_job_type_SOURCES = \
src/test-job-type.c
test_job_type_SOURCES = \
src/test-job-type.c
@@
-833,40
+843,41
@@
test_loopback_SOURCES = \
src/loopback-setup.c
test_loopback_LDADD = \
src/loopback-setup.c
test_loopback_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
test_hostname_SOURCES = \
src/test-hostname.c \
src/hostname-setup.c
test_hostname_LDADD = \
test_hostname_SOURCES = \
src/test-hostname.c \
src/hostname-setup.c
test_hostname_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
test_daemon_SOURCES = \
src/test-daemon.c
test_daemon_LDADD = \
test_daemon_SOURCES = \
src/test-daemon.c
test_daemon_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-daemon.la
test_cgroup_SOURCES = \
src/test-cgroup.c
test_cgroup_LDADD = \
libsystemd-daemon.la
test_cgroup_SOURCES = \
src/test-cgroup.c
test_cgroup_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
test_env_replace_SOURCES = \
src/test-env-replace.c
test_env_replace_LDADD = \
test_env_replace_SOURCES = \
src/test-env-replace.c
test_env_replace_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
test_strv_SOURCES = \
src/test-strv.c \
src/specifier.c
test_strv_LDADD = \
test_strv_SOURCES = \
src/test-strv.c \
src/specifier.c
test_strv_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
test_install_SOURCES = \
src/test-install.c \
test_install_SOURCES = \
src/test-install.c \
@@
-879,7
+890,8
@@
test_install_CFLAGS = \
$(DBUS_CFLAGS)
test_install_LDADD = \
$(DBUS_CFLAGS)
test_install_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
test_watchdog_SOURCES = \
src/test-watchdog.c \
test_watchdog_SOURCES = \
src/test-watchdog.c \
@@
-887,7
+899,7
@@
test_watchdog_SOURCES = \
src/watchdog.h
test_watchdog_LDADD = \
src/watchdog.h
test_watchdog_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
@@
-899,7
+911,7
@@
systemd_initctl_CFLAGS = \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-daemon.la \
$(DBUS_LIBS)
libsystemd-daemon.la \
$(DBUS_LIBS)
@@
-915,7
+927,7
@@
systemd_update_utmp_CFLAGS = \
$(AUDIT_CFLAGS)
systemd_update_utmp_LDADD = \
$(AUDIT_CFLAGS)
systemd_update_utmp_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
$(DBUS_LIBS) \
$(AUDIT_LIBS)
$(DBUS_LIBS) \
$(AUDIT_LIBS)
@@
-925,9
+937,14
@@
systemd_shutdownd_SOURCES = \
src/shutdownd.c
systemd_shutdownd_LDADD = \
src/shutdownd.c
systemd_shutdownd_LDADD = \
- libsystemd-basic.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libsystemd-daemon.la
libsystemd-daemon.la
+pkginclude_HEADERS += \
+ src/systemd/sd-shutdown.h
+
+# ------------------------------------------------------------------------------
systemd_shutdown_SOURCES = \
src/mount-setup.c \
src/umount.c \
systemd_shutdown_SOURCES = \
src/mount-setup.c \
src/umount.c \
@@
-936,7
+953,8
@@
systemd_shutdown_SOURCES = \
src/watchdog.h
systemd_shutdown_LDADD = \
src/watchdog.h
systemd_shutdown_LDADD = \
- libsystemd-basic.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libudev.la
# ------------------------------------------------------------------------------
libudev.la
# ------------------------------------------------------------------------------
@@
-948,7
+966,7
@@
systemd_modules_load_CFLAGS = \
$(KMOD_CFLAGS)
systemd_modules_load_LDADD = \
$(KMOD_CFLAGS)
systemd_modules_load_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
$(KMOD_LIBS)
# ------------------------------------------------------------------------------
$(KMOD_LIBS)
# ------------------------------------------------------------------------------
@@
-956,23
+974,25
@@
systemd_tmpfiles_SOURCES = \
src/tmpfiles.c
systemd_tmpfiles_LDADD = \
src/tmpfiles.c
systemd_tmpfiles_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup.c \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup.c \
- src/machine-id-main.c \
- src/sd-id128.c
+ src/machine-id-main.c
systemd_machine_id_setup_LDADD = \
systemd_machine_id_setup_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la \
+ libsystemd-id128.la
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
src/sysctl.c
systemd_sysctl_LDADD = \
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
src/sysctl.c
systemd_sysctl_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_fsck_SOURCES = \
# ------------------------------------------------------------------------------
systemd_fsck_SOURCES = \
@@
-984,7
+1004,7
@@
systemd_fsck_CFLAGS = \
$(DBUS_CFLAGS)
systemd_fsck_LDADD = \
$(DBUS_CFLAGS)
systemd_fsck_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libudev.la \
$(DBUS_LIBS)
libudev.la \
$(DBUS_LIBS)
@@
-993,14
+1013,14
@@
systemd_timestamp_SOURCES = \
src/timestamp.c
systemd_timestamp_LDADD = \
src/timestamp.c
systemd_timestamp_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power.c
systemd_ac_power_LDADD = \
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power.c
systemd_ac_power_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libudev.la
# ------------------------------------------------------------------------------
libudev.la
# ------------------------------------------------------------------------------
@@
-1008,7
+1028,7
@@
systemd_detect_virt_SOURCES = \
src/detect-virt.c
systemd_detect_virt_LDADD = \
src/detect-virt.c
systemd_detect_virt_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
@@
-1016,14
+1036,16
@@
systemd_getty_generator_SOURCES = \
src/unit-name.c
systemd_getty_generator_LDADD = \
src/unit-name.c
systemd_getty_generator_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
src/rc-local-generator.c
systemd_rc_local_generator_LDADD = \
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
src/rc-local-generator.c
systemd_rc_local_generator_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_remount_api_vfs_SOURCES = \
# ------------------------------------------------------------------------------
systemd_remount_api_vfs_SOURCES = \
@@
-1031,7
+1053,7
@@
systemd_remount_api_vfs_SOURCES = \
src/mount-setup.c
systemd_remount_api_vfs_LDADD = \
src/mount-setup.c
systemd_remount_api_vfs_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_cgroups_agent_SOURCES = \
# ------------------------------------------------------------------------------
systemd_cgroups_agent_SOURCES = \
@@
-1043,7
+1065,7
@@
systemd_cgroups_agent_CFLAGS = \
$(DBUS_CFLAGS)
systemd_cgroups_agent_LDADD = \
$(DBUS_CFLAGS)
systemd_cgroups_agent_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
$(DBUS_LIBS)
# ------------------------------------------------------------------------------
$(DBUS_LIBS)
# ------------------------------------------------------------------------------
@@
-1054,7
+1076,6
@@
systemctl_SOURCES = \
src/path-lookup.c \
src/cgroup-show.c \
src/unit-name.c \
src/path-lookup.c \
src/cgroup-show.c \
src/unit-name.c \
- src/pager.c \
src/install.c \
src/spawn-agent.c \
src/logs-show.c
src/install.c \
src/spawn-agent.c \
src/logs-show.c
@@
-1064,7
+1085,8
@@
systemctl_CFLAGS = \
$(DBUS_CFLAGS)
systemctl_LDADD = \
$(DBUS_CFLAGS)
systemctl_LDADD = \
- libsystemd-basic.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-daemon.la \
libsystemd-journal.la \
libsystemd-id128.la \
@@
-1076,7
+1098,7
@@
systemd_notify_SOURCES = \
src/readahead/sd-readahead.c
systemd_notify_LDADD = \
src/readahead/sd-readahead.c
systemd_notify_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-daemon.la
# ------------------------------------------------------------------------------
libsystemd-daemon.la
# ------------------------------------------------------------------------------
@@
-1085,30
+1107,30
@@
systemd_ask_password_SOURCES = \
src/ask-password-api.c
systemd_ask_password_LDADD = \
src/ask-password-api.c
systemd_ask_password_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_reply_password_SOURCES = \
src/reply-password.c
systemd_reply_password_LDADD = \
# ------------------------------------------------------------------------------
systemd_reply_password_SOURCES = \
src/reply-password.c
systemd_reply_password_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_cgls_SOURCES = \
src/cgls.c \
# ------------------------------------------------------------------------------
systemd_cgls_SOURCES = \
src/cgls.c \
- src/cgroup-show.c \
- src/pager.c
+ src/cgroup-show.c
systemd_cgls_LDADD = \
systemd_cgls_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_cgtop_SOURCES = \
src/cgtop.c
systemd_cgtop_LDADD = \
# ------------------------------------------------------------------------------
systemd_cgtop_SOURCES = \
src/cgtop.c
systemd_cgtop_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_nspawn_SOURCES = \
# ------------------------------------------------------------------------------
systemd_nspawn_SOURCES = \
@@
-1116,7
+1138,8
@@
systemd_nspawn_SOURCES = \
src/loopback-setup.c
systemd_nspawn_LDADD = \
src/loopback-setup.c
systemd_nspawn_LDADD = \
- libsystemd-basic.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libsystemd-capability.la \
libsystemd-daemon.la
libsystemd-capability.la \
libsystemd-daemon.la
@@
-1125,7
+1148,7
@@
systemd_stdio_bridge_SOURCES = \
src/bridge.c
systemd_stdio_bridge_LDADD = \
src/bridge.c
systemd_stdio_bridge_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
@@
-1134,7
+1157,8
@@
systemd_tty_ask_password_agent_SOURCES = \
src/utmp-wtmp.c
systemd_tty_ask_password_agent_LDADD = \
src/utmp-wtmp.c
systemd_tty_ask_password_agent_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd_daemon_la_SOURCES = \
# ------------------------------------------------------------------------------
libsystemd_daemon_la_SOURCES = \
@@
-1146,6
+1170,7
@@
libsystemd_daemon_la_CFLAGS = \
-DSD_EXPORT_SYMBOLS
libsystemd_daemon_la_LDFLAGS = \
-DSD_EXPORT_SYMBOLS
libsystemd_daemon_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
-shared \
-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
-shared \
-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
@@
-1265,19
+1290,25
@@
libudev_private_la_SOURCES =\
src/udev/libudev-device-private.c \
src/udev/libudev-queue-private.c
src/udev/libudev-device-private.c \
src/udev/libudev-queue-private.c
-libudev_private_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default
-
if HAVE_SELINUX
libudev_private_la_SOURCES +=\
src/udev/libudev-selinux-private.c
if HAVE_SELINUX
libudev_private_la_SOURCES +=\
src/udev/libudev-selinux-private.c
+endif
+
+libudev_private_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SELINUX_CFLAGS)
+ -fvisibility=default
libudev_private_la_LIBADD = \
$(SELINUX_LIBS)
libudev_private_la_LIBADD = \
$(SELINUX_LIBS)
-endif
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
+MANPAGES += \
+ man/udev.7 \
+ man/udevadm.8 \
+ man/udevd.8
+
udev-confdirs:
-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
udev-confdirs:
-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
@@
-1367,8
+1398,8
@@
libudev_core_la_CFLAGS = \
libudev_core_la_LIBADD = \
libudev-private.la \
libudev_core_la_LIBADD = \
libudev-private.la \
- libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-daemon.la \
+ libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@
-1404,7
+1435,8
@@
udevadm_SOURCES = \
src/udev/udevadm-test-builtin.c
udevadm_LDADD = \
src/udev/udevadm-test-builtin.c
udevadm_LDADD = \
- libudev-core.la
+ libudev-core.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
TESTS = \
# ------------------------------------------------------------------------------
TESTS = \
@@
-1427,7
+1459,7
@@
test_udev_SOURCES = \
test_udev_LDADD = \
libudev-core.la \
libudev-private.la \
test_udev_LDADD = \
libudev-core.la \
libudev-private.la \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
test_udev_DEPENDENCIES = \
src/udev/test/sys
test_udev_DEPENDENCIES = \
src/udev/test/sys
@@
-1451,7
+1483,7
@@
ata_id_SOURCES = \
ata_id_LDADD = \
libudev-private.la \
ata_id_LDADD = \
libudev-private.la \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
udevlibexec_PROGRAMS += \
ata_id
udevlibexec_PROGRAMS += \
ata_id
@@
-1462,7
+1494,7
@@
cdrom_id_SOURCES = \
cdrom_id_LDADD = \
libudev.la \
cdrom_id_LDADD = \
libudev.la \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
udevlibexec_PROGRAMS += \
cdrom_id
udevlibexec_PROGRAMS += \
cdrom_id
@@
-1489,7
+1521,7
@@
scsi_id_SOURCES =\
scsi_id_LDADD = \
libudev-private.la \
scsi_id_LDADD = \
libudev-private.la \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
udevlibexec_PROGRAMS += \
scsi_id
udevlibexec_PROGRAMS += \
scsi_id
@@
-1516,7
+1548,7
@@
accelerometer_SOURCES = \
accelerometer_LDADD = \
libudev.la -lm \
accelerometer_LDADD = \
libudev.la -lm \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
udevlibexec_PROGRAMS += \
accelerometer
udevlibexec_PROGRAMS += \
accelerometer
@@
-1594,6
+1626,7
@@
libgudev_1_0_la_LIBADD = \
$(GLIB_LIBS)
libgudev_1_0_la_LDFLAGS = \
$(GLIB_LIBS)
libgudev_1_0_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
-version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
-export-dynamic -no-undefined \
-export-symbols-regex '^g_udev_.*'
-version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
-export-dynamic -no-undefined \
-export-symbols-regex '^g_udev_.*'
@@
-1833,19
+1866,20
@@
libsystemd_id128_la_CFLAGS = \
-fvisibility=hidden
libsystemd_id128_la_LDFLAGS = \
-fvisibility=hidden
libsystemd_id128_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
-shared \
-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
libsystemd_id128_la_LIBADD = \
-shared \
-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
libsystemd_id128_la_LIBADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
test_id128_SOURCES = \
test_id128_SOURCES = \
- src/test-id128.c \
- src/sd-id128.c
+ src/test-id128.c
test_id128_LDADD = \
test_id128_LDADD = \
- libsystemd-basic.la
+ libsystemd-shared.la \
+ libsystemd-id128.la
noinst_PROGRAMS += \
test-id128
noinst_PROGRAMS += \
test-id128
@@
-1885,12
+1919,18
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
systemd_journald_SOURCES = \
src/journal/journald.c \
# ------------------------------------------------------------------------------
systemd_journald_SOURCES = \
src/journal/journald.c \
+ src/journal/journald.h \
src/journal/sd-journal.c \
src/journal/journal-file.c \
src/journal/sd-journal.c \
src/journal/journal-file.c \
+ src/journal/journal-file.h \
src/journal/lookup3.c \
src/journal/lookup3.c \
+ src/journal/lookup3.h \
src/journal/journal-rate-limit.c \
src/journal/journal-rate-limit.c \
+ src/journal/journal-rate-limit.h \
src/journal/sparse-endian.h \
src/journal/sparse-endian.h \
- src/sd-id128.c
+ src/journal/journal-def.h \
+ src/journal/journal-internal.h \
+ src/journal/compress.h
nodist_systemd_journald_SOURCES = \
src/journal/journald-gperf.c
nodist_systemd_journald_SOURCES = \
src/journal/journald-gperf.c
@@
-1898,10
+1938,12
@@
nodist_systemd_journald_SOURCES = \
systemd_journald_CFLAGS =
systemd_journald_LDADD = \
systemd_journald_CFLAGS =
systemd_journald_LDADD = \
- libsystemd-basic.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-audit.la \
libsystemd-daemon.la \
- libsystemd-login.la
+ libsystemd-login.la \
+ libsystemd-id128.la
if HAVE_ACL
systemd_journald_LDADD += \
if HAVE_ACL
systemd_journald_LDADD += \
@@
-1924,16
+1966,15
@@
systemd_cat_SOURCES = \
src/journal/cat.c
systemd_cat_LDADD = \
src/journal/cat.c
systemd_cat_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-journal.la
journalctl_SOURCES = \
src/journal/journalctl.c \
libsystemd-journal.la
journalctl_SOURCES = \
src/journal/journalctl.c \
- src/pager.c \
src/logs-show.c
journalctl_LDADD = \
src/logs-show.c
journalctl_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-journal.la \
libsystemd-id128.la
libsystemd-journal.la \
libsystemd-id128.la
@@
-1952,11
+1993,12
@@
test_journal_SOURCES = \
src/journal/sd-journal.c \
src/journal/journal-file.c \
src/journal/lookup3.c \
src/journal/sd-journal.c \
src/journal/journal-file.c \
src/journal/lookup3.c \
- src/journal/journal-send.c \
- src/sd-id128.c
+ src/journal/journal-send.c
test_journal_LDADD = \
test_journal_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la \
+ libsystemd-id128.la
if HAVE_XZ
test_journal_SOURCES += \
if HAVE_XZ
test_journal_SOURCES += \
@@
-1974,7
+2016,7
@@
test_journal_send_SOURCES = \
src/journal/test-journal-send.c
test_journal_send_LDADD = \
src/journal/test-journal-send.c
test_journal_send_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-journal.la
libsystemd_journal_la_SOURCES = \
libsystemd-journal.la
libsystemd_journal_la_SOURCES = \
@@
-1988,12
+2030,13
@@
libsystemd_journal_la_CFLAGS = \
-fvisibility=hidden
libsystemd_journal_la_LDFLAGS = \
-fvisibility=hidden
libsystemd_journal_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
-shared \
-version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
libsystemd_journal_la_LIBADD = \
-shared \
-version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
libsystemd_journal_la_LIBADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-id128.la
if HAVE_XZ
libsystemd-id128.la
if HAVE_XZ
@@
-2029,7
+2072,7
@@
UNINSTALL_EXEC_HOOKS += \
noinst_PROGRAMS += \
test-journal \
noinst_PROGRAMS += \
test-journal \
-
test-journal-send
+ test-journal-send
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
@@
-2074,13
+2117,6
@@
INSTALL_DATA_HOOKS += \
journal-install-data-hook
EXTRA_DIST += \
journal-install-data-hook
EXTRA_DIST += \
- src/journal/journald.h \
- src/journal/journal-def.h \
- src/journal/journal-internal.h \
- src/journal/journal-file.h \
- src/journal/lookup3.h \
- src/journal/compress.h \
- src/journal/journal-rate-limit.h \
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
units/systemd-journald.service.in \
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
units/systemd-journald.service.in \
@@
-2095,9
+2131,10
@@
systemd_coredump_SOURCES = \
src/journal/coredump.c
systemd_coredump_LDADD = \
src/journal/coredump.c
systemd_coredump_LDADD = \
- libsystemd-basic.la \
libsystemd-journal.la \
libsystemd-journal.la \
- libsystemd-login.la
+ libsystemd-login.la \
+ libsystemd-label.la \
+ libsystemd-shared.la
rootlibexec_PROGRAMS += \
systemd-coredump
rootlibexec_PROGRAMS += \
systemd-coredump
@@
-2118,7
+2155,7
@@
systemd_binfmt_SOURCES = \
src/binfmt/binfmt.c
systemd_binfmt_LDADD = \
src/binfmt/binfmt.c
systemd_binfmt_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
rootlibexec_PROGRAMS += \
systemd-binfmt
rootlibexec_PROGRAMS += \
systemd-binfmt
@@
-2157,7
+2194,7
@@
systemd_vconsole_setup_SOURCES = \
src/vconsole/vconsole-setup.c
systemd_vconsole_setup_LDADD = \
src/vconsole/vconsole-setup.c
systemd_vconsole_setup_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
rootlibexec_PROGRAMS += \
systemd-vconsole-setup
rootlibexec_PROGRAMS += \
systemd-vconsole-setup
@@
-2186,10
+2223,11
@@
endif
if ENABLE_READAHEAD
systemd_readahead_collect_SOURCES = \
src/readahead/readahead-collect.c \
if ENABLE_READAHEAD
systemd_readahead_collect_SOURCES = \
src/readahead/readahead-collect.c \
- src/readahead/readahead-common.c
+ src/readahead/readahead-common.c \
+ src/readahead/readahead-common.h
systemd_readahead_collect_LDADD = \
systemd_readahead_collect_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-daemon.la \
libudev.la
libsystemd-daemon.la \
libudev.la
@@
-2198,10
+2236,13
@@
systemd_readahead_replay_SOURCES = \
src/readahead/readahead-common.c
systemd_readahead_replay_LDADD = \
src/readahead/readahead-common.c
systemd_readahead_replay_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-daemon.la \
libudev.la
libsystemd-daemon.la \
libudev.la
+pkginclude_HEADERS += \
+ src/systemd/sd-readahead.h
+
rootlibexec_PROGRAMS += \
systemd-readahead-collect \
systemd-readahead-replay
rootlibexec_PROGRAMS += \
systemd-readahead-collect \
systemd-readahead-replay
@@
-2215,8
+2256,6
@@
nodist_systemunit_DATA += \
units/systemd-readahead-done.service
EXTRA_DIST += \
units/systemd-readahead-done.service
EXTRA_DIST += \
- src/systemd/sd-readahead.h \
- src/readahead/readahead-common.h \
units/systemd-readahead-collect.service.in \
units/systemd-readahead-replay.service.in \
units/systemd-readahead-done.service.in
units/systemd-readahead-collect.service.in \
units/systemd-readahead-replay.service.in \
units/systemd-readahead-done.service.in
@@
-2241,7
+2280,7
@@
systemd_quotacheck_SOURCES = \
src/quotacheck.c
systemd_quotacheck_LDADD = \
src/quotacheck.c
systemd_quotacheck_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-2261,7
+2300,8
@@
systemd_random_seed_SOURCES = \
src/random-seed.c
systemd_random_seed_LDADD = \
src/random-seed.c
systemd_random_seed_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
randomseed-install-data-hook:
$(MKDIR_P) -m 0755 \
randomseed-install-data-hook:
$(MKDIR_P) -m 0755 \
@@
-2298,16
+2338,18
@@
systemd_cryptsetup_CFLAGS = \
$(LIBCRYPTSETUP_CFLAGS)
systemd_cryptsetup_LDADD = \
$(LIBCRYPTSETUP_CFLAGS)
systemd_cryptsetup_LDADD = \
- $(LIBCRYPTSETUP_LIBS) \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libudev.la \
libudev.la \
- libsystemd-basic.la
+ $(LIBCRYPTSETUP_LIBS)
systemd_cryptsetup_generator_SOURCES = \
src/cryptsetup/cryptsetup-generator.c \
src/unit-name.c
systemd_cryptsetup_generator_LDADD = \
systemd_cryptsetup_generator_SOURCES = \
src/cryptsetup/cryptsetup-generator.c \
src/unit-name.c
systemd_cryptsetup_generator_LDADD = \
- libsystemd-basic.la
+ libsystemd-label.la \
+ libsystemd-shared.la
cryptsetup-install-data-hook:
$(MKDIR_P) -m 0755 \
cryptsetup-install-data-hook:
$(MKDIR_P) -m 0755 \
@@
-2332,7
+2374,7
@@
systemd_hostnamed_CFLAGS = \
$(DBUS_CFLAGS)
systemd_hostnamed_LDADD = \
$(DBUS_CFLAGS)
systemd_hostnamed_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-daemon.la \
$(DBUS_LIBS)
libsystemd-daemon.la \
$(DBUS_LIBS)
@@
-2383,7
+2425,8
@@
systemd_localed_CFLAGS = \
$(DBUS_CFLAGS)
systemd_localed_LDADD = \
$(DBUS_CFLAGS)
systemd_localed_LDADD = \
- libsystemd-basic.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libsystemd-daemon.la \
$(DBUS_LIBS)
libsystemd-daemon.la \
$(DBUS_LIBS)
@@
-2444,7
+2487,7
@@
systemd_timedated_CFLAGS = \
$(DBUS_CFLAGS)
systemd_timedated_LDADD = \
$(DBUS_CFLAGS)
systemd_timedated_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libsystemd-daemon.la \
$(DBUS_LIBS)
libsystemd-daemon.la \
$(DBUS_LIBS)
@@
-2487,17
+2530,23
@@
endif
if ENABLE_LOGIND
systemd_logind_SOURCES = \
src/login/logind.c \
if ENABLE_LOGIND
systemd_logind_SOURCES = \
src/login/logind.c \
+ src/login/logind.h \
src/login/logind-dbus.c \
src/login/logind-device.c \
src/login/logind-dbus.c \
src/login/logind-device.c \
+ src/login/logind-device.h \
src/login/logind-seat.c \
src/login/logind-seat.c \
- src/login/logind-seat
-dbus.c
\
+ src/login/logind-seat
.h
\
src/login/logind-session.c \
src/login/logind-session.c \
- src/login/logind-session
-dbus.c
\
+ src/login/logind-session
.h
\
src/login/logind-user.c \
src/login/logind-user.c \
+ src/login/logind-user.h \
+ src/login/logind-session-dbus.c \
+ src/login/logind-seat-dbus.c \
src/login/logind-user-dbus.c \
src/dbus-common.c \
src/dbus-loop.c \
src/login/logind-user-dbus.c \
src/dbus-common.c \
src/dbus-loop.c \
- src/polkit.c
+ src/polkit.c \
+ src/login/logind-acl.h
nodist_systemd_logind_SOURCES = \
src/login/logind-gperf.c
nodist_systemd_logind_SOURCES = \
src/login/logind-gperf.c
@@
-2507,7
+2556,8
@@
systemd_logind_CFLAGS = \
$(DBUS_CFLAGS)
systemd_logind_LDADD = \
$(DBUS_CFLAGS)
systemd_logind_LDADD = \
- libsystemd-basic.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libudev.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libudev.la \
@@
-2525,7
+2575,7
@@
systemd_user_sessions_SOURCES = \
src/login/user-sessions.c
systemd_user_sessions_LDADD = \
src/login/user-sessions.c
systemd_user_sessions_LDADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
rootlibexec_PROGRAMS += \
systemd-logind \
rootlibexec_PROGRAMS += \
systemd-logind \
@@
-2535,15
+2585,14
@@
loginctl_SOURCES = \
src/login/loginctl.c \
src/login/sysfs-show.c \
src/dbus-common.c \
src/login/loginctl.c \
src/login/sysfs-show.c \
src/dbus-common.c \
- src/cgroup-show.c \
- src/pager.c
+ src/cgroup-show.c
loginctl_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
loginctl_LDADD = \
loginctl_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
loginctl_LDADD = \
- libsystemd-
basic
.la \
+ libsystemd-
shared
.la \
libudev.la \
$(DBUS_LIBS)
libudev.la \
$(DBUS_LIBS)
@@
-2554,8
+2603,8
@@
test_login_SOURCES = \
src/login/test-login.c
test_login_LDADD = \
src/login/test-login.c
test_login_LDADD = \
- libsystemd-
basic
.la \
- libsystemd-
login
.la
+ libsystemd-
login
.la \
+ libsystemd-
shared
.la
noinst_PROGRAMS += \
test-login
noinst_PROGRAMS += \
test-login
@@
-2568,12
+2617,13
@@
libsystemd_login_la_CFLAGS = \
-fvisibility=hidden
libsystemd_login_la_LDFLAGS = \
-fvisibility=hidden
libsystemd_login_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
-shared \
-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
libsystemd_login_la_LIBADD = \
-shared \
-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
libsystemd_login_la_LIBADD = \
- libsystemd-
basic
.la
+ libsystemd-
shared
.la
if HAVE_PAM
pam_systemd_la_SOURCES = \
if HAVE_PAM
pam_systemd_la_SOURCES = \
@@
-2587,6
+2637,7
@@
pam_systemd_la_CFLAGS = \
-fvisibility=hidden
pam_systemd_la_LDFLAGS = \
-fvisibility=hidden
pam_systemd_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
-module \
-export-dynamic \
-avoid-version \
-module \
-export-dynamic \
-avoid-version \
@@
-2594,8
+2645,9
@@
pam_systemd_la_LDFLAGS = \
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
- libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-daemon.la \
+ libsystemd-audit.la \
+ libsystemd-shared.la \
$(PAM_LIBS) \
$(DBUS_LIBS)
$(PAM_LIBS) \
$(DBUS_LIBS)
@@
-2666,16
+2718,15
@@
systemd_multi_seat_x_SOURCES = \
src/login/multi-seat-x.c
systemd_multi_seat_x_LDADD = \
src/login/multi-seat-x.c
systemd_multi_seat_x_LDADD = \
- libsystemd-basic.la \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libudev.la
rootlibexec_PROGRAMS += \
systemd-multi-seat-x
dist_udevrules_DATA += \
libudev.la
rootlibexec_PROGRAMS += \
systemd-multi-seat-x
dist_udevrules_DATA += \
- src/login/70-uaccess.rules
-
-dist_udevrules_DATA += \
+ src/login/70-uaccess.rules \
src/login/71-seat.rules
nodist_udevrules_DATA += \
src/login/71-seat.rules
nodist_udevrules_DATA += \
@@
-2735,12
+2786,6
@@
EXTRA_DIST += \
src/login/logind-gperf.gperf \
src/login/libsystemd-login.pc.in \
src/login/libsystemd-login.sym \
src/login/logind-gperf.gperf \
src/login/libsystemd-login.pc.in \
src/login/libsystemd-login.sym \
- src/login/logind.h \
- src/login/logind-device.h \
- src/login/logind-seat.h \
- src/login/logind-session.h \
- src/login/logind-user.h \
- src/login/logind-acl.h \
src/login/73-seat-late.rules.in \
units/systemd-logind.service.in \
units/systemd-user-sessions.service.in
src/login/73-seat-late.rules.in \
units/systemd-logind.service.in \
units/systemd-user-sessions.service.in