X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=493e15e7c260e7984e450565f0e6eb5aea031d2e;hp=68a1a61045174be7878001b697c7c1d555b83918;hb=79c077224be5a868d0bba66972ef9546dae85977;hpb=04a9d3a00a9290cbf254d0b0ba2ce4521be632ae diff --git a/Makefile.am b/Makefile.am index 68a1a6104..493e15e7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,6 +126,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/systemd \ + -I $(top_srcdir)/src/core \ -I $(top_srcdir)/src/udev AM_CFLAGS = $(WARNINGFLAGS) @@ -234,7 +235,7 @@ noinst_PROGRAMS = \ test-env-replace \ test-strv \ test-install \ - test-watchdog + test-watchdog dist_pkgsysconf_DATA = \ src/system.conf \ @@ -290,6 +291,7 @@ dist_systemunit_DATA = \ 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 \ @@ -517,10 +519,7 @@ MANPAGES = \ 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 \ @@ -551,15 +550,13 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ 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/label.c \ - src/shared/label.h \ src/shared/hashmap.c \ src/shared/hashmap.h \ src/shared/set.c \ @@ -568,8 +565,6 @@ libsystemd_basic_la_SOURCES = \ 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 \ @@ -577,14 +572,34 @@ libsystemd_basic_la_SOURCES = \ src/shared/exit-status.c \ src/shared/exit-status.h \ src/shared/utf8.c \ - src/shared/utf8.h + 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.h \ + src/shared/list.h \ + src/shared/macro.h -libsystemd_basic_la_CFLAGS = \ +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-label.la + +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) -libsystemd_basic_la_LIBADD = \ - libsystemd-capability.la \ +libsystemd_label_la_LIBADD = \ $(SELINUX_LIBS) # ------------------------------------------------------------------------------ @@ -614,12 +629,13 @@ libsystemd_audit_la_LIBADD = \ libsystemd-capability.la # ------------------------------------------------------------------------------ +if HAVE_ACL noinst_LTLIBRARIES += \ libsystemd-acl.la libsystemd_acl_la_SOURCES = \ - src/shared/acl.c \ - src/shared/acl.h + src/shared/acl-util.c \ + src/shared/acl-util.h libsystemd_acl_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -627,143 +643,131 @@ libsystemd_acl_la_CFLAGS = \ libsystemd_acl_la_LIBADD = \ $(ACL_LIBS) +endif # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-core.la libsystemd_core_la_SOURCES = \ - src/unit.c \ - src/unit.h \ - src/job.c \ - src/job.h \ - src/manager.c \ - src/manager.h \ - src/path-lookup.c \ - src/path-lookup.h \ - src/load-fragment.c \ - src/load-fragment.h \ - src/service.c \ - src/service.h \ - src/automount.c \ - src/automount.h \ - src/mount.c \ - src/mount.h \ - src/swap.c \ - src/swap.h \ - src/device.c \ - src/device.h \ - src/target.c \ - src/target.h \ - src/snapshot.c \ - src/snapshot.h \ - src/socket.c \ - src/socket.h \ - src/timer.c \ - src/timer.h \ - src/path.c \ - src/path.h \ - src/load-dropin.c \ - src/load-dropin.h \ - src/execute.c \ - src/execute.h \ - src/utmp-wtmp.c \ - src/utmp-wtmp.h \ - src/dbus.c \ - src/dbus.h \ - src/dbus-manager.c \ - src/dbus-manager.h \ - src/dbus-unit.c \ - src/dbus-unit.h \ - src/dbus-job.c \ - src/dbus-job.h \ - src/dbus-service.c \ - src/dbus-service.h \ - src/dbus-socket.c \ - src/dbus-socket.h \ - src/dbus-timer.c \ - src/dbus-timer.h \ - src/dbus-target.c \ - src/dbus-target.h \ - src/dbus-mount.c \ - src/dbus-mount.h \ - src/dbus-automount.c \ - src/dbus-automount.h \ - src/dbus-swap.c \ - src/dbus-swap.h \ - src/dbus-snapshot.c \ - src/dbus-snapshot.h \ - src/dbus-device.c \ - src/dbus-device.h \ - src/dbus-execute.c \ - src/dbus-execute.h \ - src/dbus-path.c \ - src/dbus-path.h \ - src/cgroup.c \ - src/cgroup.h \ - src/mount-setup.c \ - src/mount-setup.h \ - src/hostname-setup.c \ - src/hostname-setup.h \ - src/selinux-setup.c \ - src/selinux-setup.h \ - src/ima-setup.c \ - src/ima-setup.h \ - src/loopback-setup.h \ - src/loopback-setup.c \ - src/kmod-setup.c \ - src/kmod-setup.h \ - src/locale-setup.h \ - src/locale-setup.c \ - src/machine-id-setup.c \ - src/machine-id-setup.h \ - src/fdset.c \ - src/fdset.h \ - src/cgroup-util.c \ - src/cgroup-util.h \ - src/condition.c \ - src/condition.h \ + src/def.h \ + src/missing.h \ src/dbus-common.c \ src/dbus-common.h \ - src/install.c \ - src/install.h \ + src/watchdog.c \ + src/watchdog.h \ + src/loopback-setup.h \ + src/loopback-setup.c \ + src/hostname-setup.c \ + src/hostname-setup.h \ src/specifier.c \ src/specifier.h \ - src/namespace.c \ - src/namespace.h \ + src/install.c \ + src/install.h \ + src/path-lookup.c \ + src/path-lookup.h \ src/unit-name.c \ src/unit-name.h \ - src/tcpwrap.c \ - src/tcpwrap.h \ - src/cgroup-attr.c \ - 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/ioprio.h \ - src/missing.h \ - src/list.h \ - src/securebits.h \ + src/utmp-wtmp.c \ + src/utmp-wtmp.h \ + src/machine-id-setup.c \ + src/machine-id-setup.h \ + src/mount-setup.c \ + src/mount-setup.h \ src/linux/auto_dev-ioctl.h \ src/linux/fanotify.h \ - src/initreq.h \ - src/special.h \ - src/dbus-common.h \ - src/bus-errors.h \ - src/cgroup-show.h \ - src/build.h \ - src/shutdownd.h \ - src/umount.h \ - src/ask-password-api.h \ - src/pager.h \ - src/sysfs-show.h \ - src/polkit.h \ - src/dbus-loop.h \ - src/spawn-agent.h \ - src/logs-show.h + src/core/unit.c \ + src/core/unit.h \ + src/core/job.c \ + src/core/job.h \ + src/core/manager.c \ + src/core/manager.h \ + src/core/load-fragment.c \ + src/core/load-fragment.h \ + src/core/service.c \ + src/core/service.h \ + src/core/automount.c \ + src/core/automount.h \ + src/core/mount.c \ + src/core/mount.h \ + src/core/swap.c \ + src/core/swap.h \ + src/core/device.c \ + src/core/device.h \ + src/core/target.c \ + src/core/target.h \ + src/core/snapshot.c \ + src/core/snapshot.h \ + src/core/socket.c \ + src/core/socket.h \ + src/core/timer.c \ + src/core/timer.h \ + src/core/path.c \ + src/core/path.h \ + src/core/load-dropin.c \ + src/core/load-dropin.h \ + src/core/execute.c \ + src/core/execute.h \ + src/core/dbus.c \ + src/core/dbus.h \ + src/core/dbus-manager.c \ + src/core/dbus-manager.h \ + src/core/dbus-unit.c \ + src/core/dbus-unit.h \ + src/core/dbus-job.c \ + src/core/dbus-job.h \ + src/core/dbus-service.c \ + src/core/dbus-service.h \ + src/core/dbus-socket.c \ + src/core/dbus-socket.h \ + src/core/dbus-timer.c \ + src/core/dbus-timer.h \ + src/core/dbus-target.c \ + src/core/dbus-target.h \ + src/core/dbus-mount.c \ + src/core/dbus-mount.h \ + src/core/dbus-automount.c \ + src/core/dbus-automount.h \ + src/core/dbus-swap.c \ + src/core/dbus-swap.h \ + src/core/dbus-snapshot.c \ + src/core/dbus-snapshot.h \ + src/core/dbus-device.c \ + src/core/dbus-device.h \ + src/core/dbus-execute.c \ + src/core/dbus-execute.h \ + src/core/dbus-path.c \ + src/core/dbus-path.h \ + src/core/cgroup.c \ + src/core/cgroup.h \ + src/core/selinux-setup.c \ + src/core/selinux-setup.h \ + src/core/ima-setup.c \ + src/core/ima-setup.h \ + src/core/kmod-setup.c \ + src/core/kmod-setup.h \ + src/core/locale-setup.h \ + src/core/locale-setup.c \ + src/core/fdset.c \ + src/core/fdset.h \ + src/core/condition.c \ + src/core/condition.h \ + src/core/namespace.c \ + src/core/namespace.h \ + src/core/tcpwrap.c \ + src/core/tcpwrap.h \ + src/core/cgroup-attr.c \ + src/core/cgroup-attr.h \ + src/core/securebits.h \ + src/core/initreq.h \ + src/core/special.h \ + src/core/bus-errors.h \ + src/core/build.h \ + src/core/ask-password-api.h \ + src/core/sysfs-show.h \ + src/core/polkit.h \ + src/core/dbus-loop.h \ + src/core/spawn-agent.h nodist_libsystemd_core_la_SOURCES = \ src/load-fragment-gperf.c \ @@ -781,7 +785,9 @@ libsystemd_core_la_CFLAGS = \ $(KMOD_CFLAGS) libsystemd_core_la_LIBADD = \ - libsystemd-basic.la \ + libsystemd-capability.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libudev.la \ $(DBUS_LIBS) \ $(LIBWRAP_LIBS) \ @@ -799,7 +805,9 @@ systemd_CFLAGS = \ $(DBUS_CFLAGS) systemd_LDADD = \ - libsystemd-core.la + libsystemd-core.la \ + libsystemd-daemon.la \ + libsystemd-id128.la # ------------------------------------------------------------------------------ test_engine_SOURCES = \ @@ -810,7 +818,8 @@ test_engine_CFLAGS = \ $(DBUS_CFLAGS) test_engine_LDADD = \ - libsystemd-core.la + libsystemd-core.la \ + libsystemd-daemon.la test_job_type_SOURCES = \ src/test-job-type.c @@ -833,41 +842,41 @@ test_loopback_SOURCES = \ 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 = \ - libsystemd-basic.la + libsystemd-shared.la 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 \ - src/cgroup-util.c + 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 = \ - libsystemd-basic.la + libsystemd-shared.la 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 \ @@ -880,7 +889,8 @@ test_install_CFLAGS = \ $(DBUS_CFLAGS) test_install_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la test_watchdog_SOURCES = \ src/test-watchdog.c \ @@ -888,7 +898,7 @@ test_watchdog_SOURCES = \ src/watchdog.h test_watchdog_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ @@ -900,7 +910,7 @@ systemd_initctl_CFLAGS = \ $(DBUS_CFLAGS) systemd_initctl_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ $(DBUS_LIBS) @@ -916,7 +926,7 @@ systemd_update_utmp_CFLAGS = \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ $(DBUS_LIBS) \ $(AUDIT_LIBS) @@ -926,18 +936,25 @@ systemd_shutdownd_SOURCES = \ src/shutdownd.c systemd_shutdownd_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-daemon.la +pkginclude_HEADERS += \ + src/systemd/sd-shutdown.h + +# ------------------------------------------------------------------------------ systemd_shutdown_SOURCES = \ src/mount-setup.c \ src/umount.c \ + src/umount.h \ src/shutdown.c \ src/watchdog.c \ src/watchdog.h systemd_shutdown_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libudev.la # ------------------------------------------------------------------------------ @@ -949,7 +966,7 @@ systemd_modules_load_CFLAGS = \ $(KMOD_CFLAGS) systemd_modules_load_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ $(KMOD_LIBS) # ------------------------------------------------------------------------------ @@ -957,23 +974,25 @@ systemd_tmpfiles_SOURCES = \ 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 \ - src/machine-id-main.c \ - src/sd-id128.c + src/machine-id-main.c 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 = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_fsck_SOURCES = \ @@ -985,7 +1004,7 @@ systemd_fsck_CFLAGS = \ $(DBUS_CFLAGS) systemd_fsck_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libudev.la \ $(DBUS_LIBS) @@ -994,14 +1013,14 @@ systemd_timestamp_SOURCES = \ src/timestamp.c systemd_timestamp_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ src/ac-power.c systemd_ac_power_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libudev.la # ------------------------------------------------------------------------------ @@ -1009,7 +1028,7 @@ systemd_detect_virt_SOURCES = \ src/detect-virt.c systemd_detect_virt_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_getty_generator_SOURCES = \ @@ -1017,14 +1036,16 @@ systemd_getty_generator_SOURCES = \ 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 = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_remount_api_vfs_SOURCES = \ @@ -1032,7 +1053,7 @@ systemd_remount_api_vfs_SOURCES = \ src/mount-setup.c systemd_remount_api_vfs_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgroups_agent_SOURCES = \ @@ -1044,7 +1065,7 @@ systemd_cgroups_agent_CFLAGS = \ $(DBUS_CFLAGS) systemd_cgroups_agent_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ $(DBUS_LIBS) # ------------------------------------------------------------------------------ @@ -1054,19 +1075,20 @@ systemctl_SOURCES = \ src/dbus-common.c \ src/path-lookup.c \ src/cgroup-show.c \ - src/cgroup-util.c \ + src/cgroup-show.h \ src/unit-name.c \ - src/pager.c \ src/install.c \ src/spawn-agent.c \ - src/logs-show.c + src/logs-show.c \ + src/logs-show.h systemctl_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemctl_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ libsystemd-journal.la \ libsystemd-id128.la \ @@ -1078,7 +1100,7 @@ systemd_notify_SOURCES = \ src/readahead/sd-readahead.c systemd_notify_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la # ------------------------------------------------------------------------------ @@ -1087,41 +1109,40 @@ systemd_ask_password_SOURCES = \ 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 = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgls_SOURCES = \ src/cgls.c \ src/cgroup-show.c \ - src/cgroup-util.c \ - src/pager.c + src/cgroup-show.h systemd_cgls_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgtop_SOURCES = \ - src/cgtop.c \ - src/cgroup-util.c + src/cgtop.c systemd_cgtop_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ src/nspawn.c \ - src/cgroup-util.c \ src/loopback-setup.c systemd_nspawn_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-capability.la \ libsystemd-daemon.la @@ -1130,7 +1151,7 @@ systemd_stdio_bridge_SOURCES = \ src/bridge.c systemd_stdio_bridge_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ @@ -1139,7 +1160,8 @@ systemd_tty_ask_password_agent_SOURCES = \ src/utmp-wtmp.c systemd_tty_ask_password_agent_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ @@ -1151,6 +1173,7 @@ libsystemd_daemon_la_CFLAGS = \ -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 @@ -1270,19 +1293,25 @@ libudev_private_la_SOURCES =\ 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 +endif + +libudev_private_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SELINUX_CFLAGS) + -fvisibility=default 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 @@ -1373,6 +1402,7 @@ libudev_core_la_CFLAGS = \ libudev_core_la_LIBADD = \ libudev-private.la \ libsystemd-daemon.la \ + libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -1395,9 +1425,7 @@ udevd_SOURCES = \ src/udev/udevd.c udevd_LDADD = \ - libudev-core.la \ - libsystemd-basic.la \ - libsystemd-daemon.la + libudev-core.la udevadm_SOURCES = \ src/udev/udevadm.c \ @@ -1411,9 +1439,7 @@ udevadm_SOURCES = \ udevadm_LDADD = \ libudev-core.la \ - libudev-private.la \ - libsystemd-basic.la \ - libsystemd-daemon.la + libsystemd-shared.la # ------------------------------------------------------------------------------ TESTS = \ @@ -1436,7 +1462,7 @@ test_udev_SOURCES = \ test_udev_LDADD = \ libudev-core.la \ libudev-private.la \ - libsystemd-basic.la + libsystemd-shared.la test_udev_DEPENDENCIES = \ src/udev/test/sys @@ -1460,7 +1486,7 @@ ata_id_SOURCES = \ ata_id_LDADD = \ libudev-private.la \ - libsystemd-basic.la + libsystemd-shared.la udevlibexec_PROGRAMS += \ ata_id @@ -1471,7 +1497,7 @@ cdrom_id_SOURCES = \ cdrom_id_LDADD = \ libudev.la \ - libsystemd-basic.la + libsystemd-shared.la udevlibexec_PROGRAMS += \ cdrom_id @@ -1498,7 +1524,7 @@ scsi_id_SOURCES =\ scsi_id_LDADD = \ libudev-private.la \ - libsystemd-basic.la + libsystemd-shared.la udevlibexec_PROGRAMS += \ scsi_id @@ -1525,7 +1551,7 @@ accelerometer_SOURCES = \ accelerometer_LDADD = \ libudev.la -lm \ - libsystemd-basic.la + libsystemd-shared.la udevlibexec_PROGRAMS += \ accelerometer @@ -1603,6 +1629,7 @@ libgudev_1_0_la_LIBADD = \ $(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_.*' @@ -1842,19 +1869,20 @@ libsystemd_id128_la_CFLAGS = \ -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 = \ - libsystemd-basic.la + libsystemd-shared.la test_id128_SOURCES = \ - src/test-id128.c \ - src/sd-id128.c + src/test-id128.c test_id128_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la \ + libsystemd-id128.la noinst_PROGRAMS += \ test-id128 @@ -1894,13 +1922,18 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ systemd_journald_SOURCES = \ src/journal/journald.c \ + src/journal/journald.h \ src/journal/sd-journal.c \ src/journal/journal-file.c \ + src/journal/journal-file.h \ src/journal/lookup3.c \ + src/journal/lookup3.h \ src/journal/journal-rate-limit.c \ + src/journal/journal-rate-limit.h \ src/journal/sparse-endian.h \ - src/sd-id128.c \ - src/cgroup-util.c + src/journal/journal-def.h \ + src/journal/journal-internal.h \ + src/journal/compress.h nodist_systemd_journald_SOURCES = \ src/journal/journald-gperf.c @@ -1908,10 +1941,12 @@ nodist_systemd_journald_SOURCES = \ systemd_journald_CFLAGS = systemd_journald_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-audit.la \ libsystemd-daemon.la \ - libsystemd-login.la + libsystemd-login.la \ + libsystemd-id128.la if HAVE_ACL systemd_journald_LDADD += \ @@ -1934,16 +1969,16 @@ systemd_cat_SOURCES = \ src/journal/cat.c systemd_cat_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-journal.la journalctl_SOURCES = \ src/journal/journalctl.c \ - src/pager.c \ - src/logs-show.c + src/logs-show.c \ + src/logs-show.h journalctl_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-journal.la \ libsystemd-id128.la @@ -1962,11 +1997,12 @@ test_journal_SOURCES = \ 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 = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la \ + libsystemd-id128.la if HAVE_XZ test_journal_SOURCES += \ @@ -1984,7 +2020,7 @@ test_journal_send_SOURCES = \ src/journal/test-journal-send.c test_journal_send_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-journal.la libsystemd_journal_la_SOURCES = \ @@ -1998,12 +2034,13 @@ libsystemd_journal_la_CFLAGS = \ -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 = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-id128.la if HAVE_XZ @@ -2039,7 +2076,7 @@ UNINSTALL_EXEC_HOOKS += \ noinst_PROGRAMS += \ test-journal \ - test-journal-send + test-journal-send pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -2084,13 +2121,6 @@ INSTALL_DATA_HOOKS += \ 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 \ @@ -2105,9 +2135,10 @@ systemd_coredump_SOURCES = \ src/journal/coredump.c systemd_coredump_LDADD = \ - libsystemd-basic.la \ libsystemd-journal.la \ - libsystemd-login.la + libsystemd-login.la \ + libsystemd-label.la \ + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-coredump @@ -2128,7 +2159,7 @@ systemd_binfmt_SOURCES = \ src/binfmt/binfmt.c systemd_binfmt_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-binfmt @@ -2167,7 +2198,7 @@ systemd_vconsole_setup_SOURCES = \ src/vconsole/vconsole-setup.c systemd_vconsole_setup_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-vconsole-setup @@ -2196,10 +2227,11 @@ endif 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 = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ libudev.la @@ -2208,10 +2240,13 @@ systemd_readahead_replay_SOURCES = \ src/readahead/readahead-common.c systemd_readahead_replay_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ libudev.la +pkginclude_HEADERS += \ + src/systemd/sd-readahead.h + rootlibexec_PROGRAMS += \ systemd-readahead-collect \ systemd-readahead-replay @@ -2225,8 +2260,6 @@ nodist_systemunit_DATA += \ 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 @@ -2251,7 +2284,7 @@ systemd_quotacheck_SOURCES = \ src/quotacheck.c systemd_quotacheck_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la endif # ------------------------------------------------------------------------------ @@ -2271,7 +2304,8 @@ systemd_random_seed_SOURCES = \ 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 \ @@ -2308,16 +2342,18 @@ systemd_cryptsetup_CFLAGS = \ $(LIBCRYPTSETUP_CFLAGS) systemd_cryptsetup_LDADD = \ - $(LIBCRYPTSETUP_LIBS) \ + libsystemd-label.la \ + libsystemd-shared.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 = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la cryptsetup-install-data-hook: $(MKDIR_P) -m 0755 \ @@ -2342,7 +2378,7 @@ systemd_hostnamed_CFLAGS = \ $(DBUS_CFLAGS) systemd_hostnamed_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ $(DBUS_LIBS) @@ -2393,7 +2429,8 @@ systemd_localed_CFLAGS = \ $(DBUS_CFLAGS) systemd_localed_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ $(DBUS_LIBS) @@ -2454,7 +2491,7 @@ systemd_timedated_CFLAGS = \ $(DBUS_CFLAGS) systemd_timedated_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ $(DBUS_LIBS) @@ -2497,18 +2534,23 @@ endif 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-device.h \ 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-dbus.c \ + src/login/logind-session.h \ 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/cgroup-util.c \ - src/polkit.c + src/polkit.c \ + src/login/logind-acl.h nodist_systemd_logind_SOURCES = \ src/login/logind-gperf.c @@ -2518,7 +2560,8 @@ systemd_logind_CFLAGS = \ $(DBUS_CFLAGS) systemd_logind_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-audit.la \ libsystemd-daemon.la \ libudev.la \ @@ -2533,11 +2576,10 @@ systemd_logind_LDADD += \ endif systemd_user_sessions_SOURCES = \ - src/login/user-sessions.c \ - src/cgroup-util.c + src/login/user-sessions.c systemd_user_sessions_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-logind \ @@ -2548,15 +2590,14 @@ loginctl_SOURCES = \ src/login/sysfs-show.c \ src/dbus-common.c \ src/cgroup-show.c \ - src/cgroup-util.c \ - src/pager.c + src/cgroup-show.h loginctl_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) loginctl_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libudev.la \ $(DBUS_LIBS) @@ -2567,27 +2608,27 @@ test_login_SOURCES = \ src/login/test-login.c test_login_LDADD = \ - libsystemd-basic.la \ - libsystemd-login.la + libsystemd-login.la \ + libsystemd-shared.la noinst_PROGRAMS += \ test-login libsystemd_login_la_SOURCES = \ - src/login/sd-login.c \ - src/cgroup-util.c + src/login/sd-login.c libsystemd_login_la_CFLAGS = \ $(AM_CFLAGS) \ -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 = \ - libsystemd-basic.la + libsystemd-shared.la if HAVE_PAM pam_systemd_la_SOURCES = \ @@ -2601,6 +2642,7 @@ pam_systemd_la_CFLAGS = \ -fvisibility=hidden pam_systemd_la_LDFLAGS = \ + $(AM_LDFLAGS) \ -module \ -export-dynamic \ -avoid-version \ @@ -2608,8 +2650,9 @@ pam_systemd_la_LDFLAGS = \ -export-symbols-regex '^pam_sm_.*' pam_systemd_la_LIBADD = \ - libsystemd-basic.la \ libsystemd-daemon.la \ + libsystemd-audit.la \ + libsystemd-shared.la \ $(PAM_LIBS) \ $(DBUS_LIBS) @@ -2680,16 +2723,15 @@ systemd_multi_seat_x_SOURCES = \ 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 += \ - src/login/70-uaccess.rules - -dist_udevrules_DATA += \ + src/login/70-uaccess.rules \ src/login/71-seat.rules nodist_udevrules_DATA += \ @@ -2749,12 +2791,6 @@ EXTRA_DIST += \ 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