X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6e965a0085e03576f0403e94d8d1b935ec21aa23;hp=8f56d2549605e6af6771cb25a13edf0a55161a05;hb=77d47be64f8b0497c44a4288f2531fc1056624ae;hpb=2d13da8821b8197e62f819b5b996750800e910ab diff --git a/Makefile.am b/Makefile.am index 8f56d2549..6e965a008 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,6 +84,7 @@ INSTALL_DATA_HOOKS = DISTCHECK_HOOKS = DISTCLEAN_LOCAL_HOOKS = pkginclude_HEADERS = +noinst_LTLIBRARIES = lib_LTLIBRARIES = include_HEADERS = pkgconfiglib_DATA = @@ -120,6 +121,7 @@ AM_CPPFLAGS = \ -DX_SERVER=\"$(bindir)/X\" \ -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \ -I $(top_srcdir)/src \ + -I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/readahead \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ @@ -129,6 +131,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(WARNINGFLAGS) AM_LDFLAGS = $(GCLDFLAGS) +# ------------------------------------------------------------------------------ if TARGET_GENTOO AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ @@ -183,6 +186,7 @@ endif endif endif +# ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ systemd-notify \ @@ -230,7 +234,7 @@ noinst_PROGRAMS = \ test-env-replace \ test-strv \ test-install \ - test-watchdog + test-watchdog dist_pkgsysconf_DATA = \ src/system.conf \ @@ -470,44 +474,166 @@ EXTRA_DIST += \ @INTLTOOL_POLICY_RULE@ -noinst_LTLIBRARIES = \ - libsystemd-basic.la \ - libsystemd-core.la +# ------------------------------------------------------------------------------ +MANPAGES = \ + man/systemd.1 \ + man/systemctl.1 \ + man/systemd-cgls.1 \ + man/systemd-cgtop.1 \ + man/systemd-nspawn.1 \ + man/systemd-tmpfiles.8 \ + man/systemd-notify.1 \ + man/systemd.unit.5 \ + man/systemd.service.5 \ + man/systemd.socket.5 \ + man/systemd.mount.5 \ + man/systemd.automount.5 \ + man/systemd.swap.5 \ + man/systemd.timer.5 \ + man/systemd.path.5 \ + man/systemd.target.5 \ + man/systemd.device.5 \ + man/systemd.snapshot.5 \ + man/systemd.exec.5 \ + man/systemd.special.7 \ + man/systemd.journal-fields.7 \ + man/daemon.7 \ + man/runlevel.8 \ + man/telinit.8 \ + man/halt.8 \ + man/shutdown.8 \ + man/pam_systemd.8 \ + man/systemd.conf.5 \ + man/tmpfiles.d.5 \ + man/hostname.5 \ + man/timezone.5 \ + man/machine-id.5 \ + man/locale.conf.5 \ + man/os-release.5 \ + man/machine-info.5 \ + man/modules-load.d.5 \ + man/sysctl.d.5 \ + man/systemd-ask-password.1 \ + 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 + +MANPAGES_ALIAS = \ + man/reboot.8 \ + man/poweroff.8 \ + man/init.1 + +man/reboot.8: man/halt.8 +man/poweroff.8: man/halt.8 +man/init.1: man/systemd.1 + +XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} + +if ENABLE_MANPAGES +man_MANS = \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) + +noinst_DATA = \ + ${XML_FILES:.xml=.html} +endif + +EXTRA_DIST += \ + $(XML_FILES) \ + ${XML_FILES:.xml=.html} \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-basic.la libsystemd_basic_la_SOURCES = \ - src/util.c \ - src/util.h \ - src/virt.c \ - src/virt.h \ - src/label.c \ - src/label.h \ - src/hashmap.c \ - src/hashmap.h \ - src/set.c \ - src/set.h \ - src/strv.c \ - src/strv.h \ - src/conf-parser.c \ - src/conf-parser.h \ - src/socket-util.c \ - src/socket-util.h \ - src/log.c \ - src/log.h \ - src/ratelimit.h \ - src/ratelimit.c \ - src/exit-status.c \ - src/exit-status.h \ - src/utf8.c \ - src/utf8.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/set.h \ + src/shared/strv.c \ + 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/ratelimit.c \ + src/shared/exit-status.c \ + src/shared/exit-status.h \ + src/shared/utf8.c \ + src/shared/utf8.h \ + src/shared/cgroup-util.c \ + src/shared/cgroup-util.h libsystemd_basic_la_CFLAGS = \ $(AM_CFLAGS) \ $(SELINUX_CFLAGS) libsystemd_basic_la_LIBADD = \ - $(SELINUX_LIBS) \ + libsystemd-capability.la \ + $(SELINUX_LIBS) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-capability.la + +libsystemd_capability_la_SOURCES = \ + src/shared/capability.c \ + src/shared/capability.h + +libsystemd_capability_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CAP_CFLAGS) + +libsystemd_capability_la_LIBADD = \ $(CAP_LIBS) +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-audit.la + +libsystemd_audit_la_SOURCES = \ + src/shared/audit.c \ + src/shared/audit.h + +libsystemd_audit_la_LIBADD = \ + libsystemd-capability.la + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-acl.la + +libsystemd_acl_la_SOURCES = \ + src/shared/acl.c \ + src/shared/acl.h + +libsystemd_acl_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(ACL_CFLAGS) + +libsystemd_acl_la_LIBADD = \ + $(ACL_LIBS) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-core.la + libsystemd_core_la_SOURCES = \ src/unit.c \ src/unit.h \ @@ -595,8 +721,6 @@ libsystemd_core_la_SOURCES = \ 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/dbus-common.c \ @@ -613,8 +737,8 @@ libsystemd_core_la_SOURCES = \ src/tcpwrap.h \ src/cgroup-attr.c \ src/cgroup-attr.h \ - src/watchdog.c \ - src/watchdog.h \ + src/watchdog.c \ + src/watchdog.h \ src/sd-daemon.c \ src/sd-id128.c \ src/macro.h \ @@ -639,7 +763,6 @@ libsystemd_core_la_SOURCES = \ src/polkit.h \ src/dbus-loop.h \ src/spawn-agent.h \ - src/acl-util.h \ src/logs-show.h nodist_libsystemd_core_la_SOURCES = \ @@ -667,80 +790,7 @@ libsystemd_core_la_LIBADD = \ $(CAP_LIBS) \ $(KMOD_LIBS) -MANPAGES = \ - man/systemd.1 \ - man/systemctl.1 \ - man/systemd-cgls.1 \ - man/systemd-cgtop.1 \ - man/systemd-nspawn.1 \ - man/systemd-tmpfiles.8 \ - man/systemd-notify.1 \ - man/systemd.unit.5 \ - man/systemd.service.5 \ - man/systemd.socket.5 \ - man/systemd.mount.5 \ - man/systemd.automount.5 \ - man/systemd.swap.5 \ - man/systemd.timer.5 \ - man/systemd.path.5 \ - man/systemd.target.5 \ - man/systemd.device.5 \ - man/systemd.snapshot.5 \ - man/systemd.exec.5 \ - man/systemd.special.7 \ - man/systemd.journal-fields.7 \ - man/daemon.7 \ - man/runlevel.8 \ - man/telinit.8 \ - man/halt.8 \ - man/shutdown.8 \ - man/pam_systemd.8 \ - man/systemd.conf.5 \ - man/tmpfiles.d.5 \ - man/hostname.5 \ - man/timezone.5 \ - man/machine-id.5 \ - man/locale.conf.5 \ - man/os-release.5 \ - man/machine-info.5 \ - man/modules-load.d.5 \ - man/sysctl.d.5 \ - man/systemd-ask-password.1 \ - 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 - -MANPAGES_ALIAS = \ - man/reboot.8 \ - man/poweroff.8 \ - man/init.1 - -man/reboot.8: man/halt.8 -man/poweroff.8: man/halt.8 -man/init.1: man/systemd.1 - -XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} - -if ENABLE_MANPAGES -man_MANS = \ - $(MANPAGES) \ - $(MANPAGES_ALIAS) - -noinst_DATA = \ - ${XML_FILES:.xml=.html} -endif - -EXTRA_DIST += \ - $(XML_FILES) \ - ${XML_FILES:.xml=.html} \ - $(MANPAGES) \ - $(MANPAGES_ALIAS) - +# ------------------------------------------------------------------------------ systemd_SOURCES = \ src/main.c @@ -751,23 +801,32 @@ systemd_CFLAGS = \ systemd_LDADD = \ libsystemd-core.la +# ------------------------------------------------------------------------------ test_engine_SOURCES = \ src/test-engine.c -test_engine_CFLAGS = $(systemd_CFLAGS) -test_engine_LDADD = $(systemd_LDADD) +test_engine_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_engine_LDADD = \ + libsystemd-core.la test_job_type_SOURCES = \ src/test-job-type.c -test_job_type_CFLAGS = $(systemd_CFLAGS) -test_job_type_LDADD = $(systemd_LDADD) +test_job_type_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_job_type_LDADD = \ + libsystemd-core.la test_ns_SOURCES = \ src/test-ns.c -test_ns_CFLAGS = $(systemd_CFLAGS) -test_ns_LDADD = $(systemd_LDADD) +test_ns_LDADD = \ + libsystemd-core.la test_loopback_SOURCES = \ src/test-loopback.c \ @@ -791,8 +850,7 @@ test_daemon_LDADD = \ libsystemd-daemon.la test_cgroup_SOURCES = \ - src/test-cgroup.c \ - src/cgroup-util.c + src/test-cgroup.c test_cgroup_LDADD = \ libsystemd-basic.la @@ -824,13 +882,14 @@ test_install_LDADD = \ libsystemd-basic.la test_watchdog_SOURCES = \ - src/test-watchdog.c \ + src/test-watchdog.c \ src/watchdog.c \ - src/watchdog.h + src/watchdog.h test_watchdog_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ src/initctl.c \ src/dbus-common.c @@ -844,6 +903,7 @@ systemd_initctl_LDADD = \ libsystemd-daemon.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ src/update-utmp.c \ src/dbus-common.c \ @@ -859,13 +919,11 @@ systemd_update_utmp_LDADD = \ $(DBUS_LIBS) \ $(AUDIT_LIBS) +# ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/utmp-wtmp.c \ src/shutdownd.c -systemd_shutdownd_CFLAGS = \ - $(AM_CFLAGS) - systemd_shutdownd_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la @@ -874,29 +932,33 @@ systemd_shutdown_SOURCES = \ src/mount-setup.c \ src/umount.c \ src/shutdown.c \ - src/watchdog.c \ - src/watchdog.h + src/watchdog.c \ + src/watchdog.h systemd_shutdown_LDADD = \ libsystemd-basic.la \ libudev.la +# ------------------------------------------------------------------------------ systemd_modules_load_SOURCES = \ src/modules-load.c systemd_modules_load_CFLAGS = \ + $(AM_CFLAGS) \ $(KMOD_CFLAGS) systemd_modules_load_LDADD = \ libsystemd-basic.la \ $(KMOD_LIBS) +# ------------------------------------------------------------------------------ systemd_tmpfiles_SOURCES = \ src/tmpfiles.c systemd_tmpfiles_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ src/machine-id-setup.c \ src/machine-id-main.c \ @@ -905,12 +967,14 @@ systemd_machine_id_setup_SOURCES = \ systemd_machine_id_setup_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_sysctl_SOURCES = \ src/sysctl.c systemd_sysctl_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_fsck_SOURCES = \ src/fsck.c \ src/dbus-common.c @@ -924,12 +988,14 @@ systemd_fsck_LDADD = \ libudev.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_timestamp_SOURCES = \ src/timestamp.c systemd_timestamp_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ src/ac-power.c @@ -937,12 +1003,14 @@ systemd_ac_power_LDADD = \ libsystemd-basic.la \ libudev.la +# ------------------------------------------------------------------------------ systemd_detect_virt_SOURCES = \ src/detect-virt.c systemd_detect_virt_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_getty_generator_SOURCES = \ src/getty-generator.c \ src/unit-name.c @@ -950,20 +1018,22 @@ systemd_getty_generator_SOURCES = \ systemd_getty_generator_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator.c systemd_rc_local_generator_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_remount_api_vfs_SOURCES = \ src/remount-api-vfs.c \ - src/mount-setup.c \ - src/exit-status.c + src/mount-setup.c systemd_remount_api_vfs_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_cgroups_agent_SOURCES = \ src/cgroups-agent.c \ src/dbus-common.c @@ -976,14 +1046,13 @@ systemd_cgroups_agent_LDADD = \ libsystemd-basic.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemctl_SOURCES = \ src/systemctl.c \ src/utmp-wtmp.c \ src/dbus-common.c \ src/path-lookup.c \ src/cgroup-show.c \ - src/cgroup-util.c \ - src/exit-status.c \ src/unit-name.c \ src/pager.c \ src/install.c \ @@ -1001,6 +1070,7 @@ systemctl_LDADD = \ libsystemd-id128.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ src/notify.c \ src/readahead/sd-readahead.c @@ -1009,6 +1079,7 @@ systemd_notify_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la +# ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ src/ask-password.c \ src/ask-password-api.c @@ -1016,43 +1087,47 @@ systemd_ask_password_SOURCES = \ systemd_ask_password_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_reply_password_SOURCES = \ src/reply-password.c systemd_reply_password_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_cgls_SOURCES = \ src/cgls.c \ src/cgroup-show.c \ - src/cgroup-util.c \ src/pager.c systemd_cgls_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_cgtop_SOURCES = \ - src/cgtop.c \ - src/cgroup-util.c + src/cgtop.c systemd_cgtop_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ src/nspawn.c \ - src/cgroup-util.c \ src/loopback-setup.c systemd_nspawn_LDADD = \ libsystemd-basic.la \ + libsystemd-capability.la \ libsystemd-daemon.la +# ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ src/bridge.c systemd_stdio_bridge_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent.c \ src/ask-password-api.c \ @@ -1137,9 +1212,6 @@ include_HEADERS += \ lib_LTLIBRARIES += \ libudev.la -noinst_LTLIBRARIES += \ - libudev-private.la - libudev_la_SOURCES =\ src/udev/libudev-private.h \ src/udev/libudev.c \ @@ -1150,24 +1222,14 @@ libudev_la_SOURCES =\ src/udev/libudev-monitor.c \ src/udev/libudev-queue.c +libudev_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden + libudev_la_LDFLAGS = \ $(AM_LDFLAGS) \ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) -libudev_private_la_SOURCES =\ - $(libudev_la_SOURCES) \ - src/udev/libudev-util-private.c \ - src/udev/libudev-device-private.c \ - src/udev/libudev-queue-private.c - -if HAVE_SELINUX -libudev_private_la_SOURCES +=\ - src/udev/libudev-selinux-private.c -endif - -libudev_private_la_LIBADD = \ - $(SELINUX_LIBS) - pkgconfiglib_DATA += \ src/udev/libudev.pc @@ -1193,6 +1255,28 @@ libudev-uninstall-move-hook: INSTALL_EXEC_HOOKS += libudev-install-move-hook UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libudev-private.la + +libudev_private_la_SOURCES =\ + $(libudev_la_SOURCES) \ + src/udev/libudev-util-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 + +libudev_private_la_LIBADD = \ + $(SELINUX_LIBS) +endif + # ------------------------------------------------------------------------------ udev-confdirs: -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d @@ -1257,7 +1341,10 @@ bin_PROGRAMS += \ udevlibexec_PROGRAMS = \ udevd -udev_common_sources = \ +noinst_LTLIBRARIES += \ + libudev-core.la + +libudev_core_la_SOURCES = \ src/udev/udev.h \ src/udev/udev-event.c \ src/udev/udev-watch.c \ @@ -1271,54 +1358,42 @@ udev_common_sources = \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-kmod.c \ src/udev/udev-builtin-path_id.c \ - src/udev/udev-builtin-usb_id.c \ - src/systemd/sd-daemon.h \ - src/sd-daemon.c + src/udev/udev-builtin-usb_id.c -udev_common_CFLAGS = \ +libudev_core_la_CFLAGS = \ + $(AM_CFLAGS) \ $(BLKID_CFLAGS) \ $(KMOD_CFLAGS) -udev_common_LDADD = \ +libudev_core_la_LIBADD = \ libudev-private.la \ + libsystemd-basic.la \ + libsystemd-daemon.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) -udev_common_CPPFLAGS = \ +libudev_core_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \ -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\" if HAVE_ACL -udev_common_sources += \ +libudev_core_la_SOURCES += \ src/udev/udev-builtin-uaccess.c \ - src/login/logind-acl.c \ - src/acl-util.c - -udev_common_CFLAGS += \ - $(ACL_CFLAGS) + src/login/logind-acl.c -udev_common_LDADD += \ +libudev_core_la_LIBADD += \ libsystemd-login.la \ - $(ACL_LIBS) + libsystemd-acl.la endif udevd_SOURCES = \ - $(udev_common_sources) \ src/udev/udevd.c -udevd_CFLAGS = \ - $(udev_common_CFLAGS) - udevd_LDADD = \ - $(udev_common_LDADD) \ - libsystemd-basic.la - -udevd_CPPFLAGS = \ - $(udev_common_CPPFLAGS) + libudev-core.la udevadm_SOURCES = \ - $(udev_common_sources) \ src/udev/udevadm.c \ src/udev/udevadm-info.c \ src/udev/udevadm-control.c \ @@ -1328,15 +1403,8 @@ udevadm_SOURCES = \ src/udev/udevadm-test.c \ src/udev/udevadm-test-builtin.c -udevadm_CFLAGS = \ - $(udev_common_CFLAGS) - udevadm_LDADD = \ - $(udev_common_LDADD) \ - libsystemd-basic.la - -udevadm_CPPFLAGS = \ - $(udev_common_CPPFLAGS) + libudev-core.la # ------------------------------------------------------------------------------ TESTS = \ @@ -1354,19 +1422,13 @@ test_libudev_LDADD = \ libudev.la test_udev_SOURCES = \ - $(udev_common_sources) \ src/udev/test-udev.c -test_udev_CFLAGS = \ - $(udev_common_CFLAGS) - test_udev_LDADD = \ - $(udev_common_LDADD) \ + libudev-core.la \ + libudev-private.la \ libsystemd-basic.la -test_udev_CPPFLAGS = \ - $(udev_common_CPPFLAGS) - test_udev_DEPENDENCIES = \ src/udev/test/sys @@ -1399,7 +1461,7 @@ cdrom_id_SOURCES = \ src/udev/cdrom_id/cdrom_id.c cdrom_id_LDADD = \ - libudev-private.la \ + libudev.la \ libsystemd-basic.la udevlibexec_PROGRAMS += \ @@ -1440,7 +1502,7 @@ v4l_id_SOURCES = \ src/udev/v4l_id/v4l_id.c v4l_id_LDADD = \ - libudev-private.la + libudev.la udevlibexec_PROGRAMS += \ v4l_id @@ -1453,7 +1515,7 @@ accelerometer_SOURCES = \ src/udev/accelerometer/accelerometer.c accelerometer_LDADD = \ - libudev-private.la -lm \ + libudev.la -lm \ libsystemd-basic.la udevlibexec_PROGRAMS += \ @@ -1523,6 +1585,7 @@ libgudev_1_0_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GUdev\" libgudev_1_0_la_CFLAGS = \ + $(AM_CFLAGS) \ -fvisibility=default \ $(GLIB_CFLAGS) @@ -1827,32 +1890,32 @@ systemd_journald_SOURCES = \ src/journal/lookup3.c \ src/journal/journal-rate-limit.c \ src/journal/sparse-endian.h \ - src/sd-id128.c \ - src/cgroup-util.c - -if HAVE_ACL -systemd_journald_SOURCES += \ - src/acl-util.c -endif + src/sd-id128.c nodist_systemd_journald_SOURCES = \ src/journal/journald-gperf.c -systemd_journald_CFLAGS = \ - $(AM_CFLAGS) \ - $(ACL_CFLAGS) +systemd_journald_CFLAGS = systemd_journald_LDADD = \ libsystemd-basic.la \ + libsystemd-audit.la \ libsystemd-daemon.la \ - libsystemd-login.la \ - $(ACL_LIBS) + libsystemd-login.la + +if HAVE_ACL +systemd_journald_LDADD += \ + libsystemd-acl.la +endif if HAVE_XZ systemd_journald_SOURCES += \ src/journal/compress.c + systemd_journald_CFLAGS += \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) + systemd_journald_LDADD += \ $(XZ_LIBS) endif @@ -1938,6 +2001,7 @@ libsystemd_journal_la_SOURCES += \ src/journal/compress.c libsystemd_journal_la_CFLAGS += \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) libsystemd_journal_la_LIBADD += \ @@ -2433,33 +2497,32 @@ systemd_logind_SOURCES = \ src/login/logind-user-dbus.c \ src/dbus-common.c \ src/dbus-loop.c \ - src/cgroup-util.c \ src/polkit.c nodist_systemd_logind_SOURCES = \ src/login/logind-gperf.c -if HAVE_ACL -systemd_logind_SOURCES += \ - src/login/logind-acl.c \ - src/acl-util.c -endif - systemd_logind_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(ACL_CFLAGS) + $(DBUS_CFLAGS) systemd_logind_LDADD = \ libsystemd-basic.la \ + libsystemd-audit.la \ libsystemd-daemon.la \ libudev.la \ - $(DBUS_LIBS) \ - $(ACL_LIBS) + $(DBUS_LIBS) + +if HAVE_ACL +systemd_logind_SOURCES += \ + src/login/logind-acl.c + +systemd_logind_LDADD += \ + libsystemd-acl.la +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 @@ -2473,7 +2536,6 @@ loginctl_SOURCES = \ src/login/sysfs-show.c \ src/dbus-common.c \ src/cgroup-show.c \ - src/cgroup-util.c \ src/pager.c loginctl_CFLAGS = \ @@ -2499,8 +2561,7 @@ 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) \