X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=ff156c00eefb1a44901e77a8d6b0ff4e5e09714d;hb=08e1fb68d78b4adf26cce8387fc428b9e370bcf4;hp=5bba4f990bf92e9e9b88232ce73d8d44e56c1268;hpb=ec1a9f88f2a91d9358c254ea8098b4e9190fb146;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 5bba4f990..ff156c00e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,6 +130,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src \ -I $(top_srcdir)/src/shared \ -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 @@ -205,7 +206,8 @@ bin_PROGRAMS = \ systemd-cgls \ systemd-cgtop \ systemd-stdio-bridge \ - systemd-nspawn + systemd-nspawn \ + systemd-detect-virt dist_bin_SCRIPTS = \ src/systemd-analyze @@ -223,7 +225,6 @@ rootlibexec_PROGRAMS = \ systemd-fsck \ systemd-timestamp \ systemd-ac-power \ - systemd-detect-virt \ systemd-sysctl systemgenerator_PROGRAMS = \ @@ -484,6 +485,7 @@ MANPAGES = \ man/systemd-ask-password.1 \ man/systemd-cat.1 \ man/systemd-machine-id-setup.1 \ + man/systemd-detect-virt.1 \ man/journald.conf.5 \ man/journalctl.1 @@ -519,9 +521,12 @@ noinst_LTLIBRARIES += \ libsystemd-shared.la libsystemd_shared_la_SOURCES = \ - src/missing.h \ src/linux/auto_dev-ioctl.h \ src/linux/fanotify.h \ + src/shared/list.h \ + src/shared/macro.h \ + src/shared/def.h \ + src/shared/missing.h \ src/shared/util.c \ src/shared/util.h \ src/shared/virt.c \ @@ -549,10 +554,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/socket-util.h \ src/shared/cgroup-util.c \ src/shared/cgroup-util.h \ - src/shared/dbus-common.c \ - src/shared/dbus-common.h \ - src/shared/logs-show.c \ - src/shared/logs-show.h \ src/shared/cgroup-show.c \ src/shared/cgroup-show.h \ src/shared/unit-name.c \ @@ -563,24 +564,34 @@ libsystemd_shared_la_SOURCES = \ src/shared/watchdog.h \ src/shared/spawn-ask-password-agent.c \ src/shared/spawn-ask-password-agent.h \ - src/shared/mount-setup.c \ - src/shared/mount-setup.h \ - src/shared/machine-id-setup.c \ - src/shared/machine-id-setup.h \ - src/shared/loopback-setup.h \ - src/shared/loopback-setup.c \ src/shared/specifier.c \ src/shared/specifier.h \ src/shared/spawn-polkit-agent.c \ - src/shared/spawn-polkit-agent.h \ - src/shared/list.h \ - src/shared/macro.h \ - src/shared/ask-password-api.h + src/shared/spawn-polkit-agent.h libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) +#------------------------------------------------------------------------------- +noinst_LTLIBRARIES += \ + libsystemd-dbus.la + +libsystemd_dbus_la_SOURCES = \ + src/shared/dbus-common.c \ + src/shared/dbus-common.h \ + src/shared/dbus-loop.c \ + src/shared/dbus-loop.h \ + src/shared/polkit.c \ + src/shared/polkit.h + +libsystemd_dbus_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +libsystemd_dbus_la_LIBADD = \ + $(DBUS_LIBS) + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-label.la @@ -595,7 +606,9 @@ libsystemd_label_la_SOURCES = \ src/shared/label.c \ src/shared/label.h \ src/shared/mkdir.c \ - src/shared/mkdir.h + src/shared/mkdir.h \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h libsystemd_label_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -605,6 +618,21 @@ libsystemd_label_la_CFLAGS = \ libsystemd_label_la_LIBADD = \ $(SELINUX_LIBS) +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-logs.la + +libsystemd_logs_la_SOURCES = \ + src/shared/logs-show.c \ + src/shared/logs-show.h + +libsystemd_logs_la_CFLAGS = \ + $(AM_CFLAGS) + +libsystemd_logs_la_LIBADD = \ + libsystemd-journal.la \ + libsystemd-id128.la + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-capability.la @@ -653,7 +681,6 @@ noinst_LTLIBRARIES += \ libsystemd-core.la libsystemd_core_la_SOURCES = \ - src/def.h \ src/core/unit.c \ src/core/unit.h \ src/core/job.c \ @@ -728,6 +755,12 @@ libsystemd_core_la_SOURCES = \ src/core/locale-setup.c \ src/core/hostname-setup.c \ src/core/hostname-setup.h \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/loopback-setup.h \ + src/core/loopback-setup.c \ src/core/fdset.c \ src/core/fdset.h \ src/core/condition.c \ @@ -761,6 +794,7 @@ libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-label.la \ libsystemd-shared.la \ + libsystemd-dbus.la \ libudev.la \ $(DBUS_LIBS) \ $(LIBWRAP_LIBS) \ @@ -792,7 +826,8 @@ systemd_CFLAGS = \ systemd_LDADD = \ libsystemd-core.la \ libsystemd-daemon.la \ - libsystemd-id128.la + libsystemd-id128.la \ + libsystemd-dbus.la dist_pkgsysconf_DATA += \ src/core/system.conf \ @@ -843,7 +878,8 @@ test_engine_CFLAGS = \ test_engine_LDADD = \ libsystemd-core.la \ - libsystemd-daemon.la + libsystemd-daemon.la \ + libsystemd-dbus.la test_job_type_SOURCES = \ src/test/test-job-type.c @@ -865,7 +901,8 @@ test_loopback_SOURCES = \ src/test/test-loopback.c test_loopback_LDADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-core.la test_hostname_SOURCES = \ src/test/test-hostname.c @@ -918,7 +955,7 @@ test_watchdog_LDADD = \ # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ - src/initctl.c + src/initctl/initctl.c systemd_initctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -927,11 +964,12 @@ systemd_initctl_CFLAGS = \ systemd_initctl_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) # ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ - src/update-utmp.c + src/update-utmp/update-utmp.c systemd_update_utmp_CFLAGS = \ $(AM_CFLAGS) \ @@ -940,12 +978,13 @@ systemd_update_utmp_CFLAGS = \ systemd_update_utmp_LDADD = \ libsystemd-shared.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) \ $(AUDIT_LIBS) # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ - src/shutdownd.c + src/shutdownd/shutdownd.c systemd_shutdownd_LDADD = \ libsystemd-label.la \ @@ -959,7 +998,9 @@ pkginclude_HEADERS += \ systemd_shutdown_SOURCES = \ src/core/umount.c \ src/core/umount.h \ - src/core/shutdown.c + src/core/shutdown.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h systemd_shutdown_LDADD = \ libsystemd-label.la \ @@ -968,7 +1009,7 @@ systemd_shutdown_LDADD = \ # ------------------------------------------------------------------------------ systemd_modules_load_SOURCES = \ - src/modules-load.c + src/modules-load/modules-load.c systemd_modules_load_CFLAGS = \ $(AM_CFLAGS) \ @@ -980,7 +1021,7 @@ systemd_modules_load_LDADD = \ # ------------------------------------------------------------------------------ systemd_tmpfiles_SOURCES = \ - src/tmpfiles.c + src/tmpfiles/tmpfiles.c systemd_tmpfiles_LDADD = \ libsystemd-label.la \ @@ -988,7 +1029,9 @@ systemd_tmpfiles_LDADD = \ # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ - src/machine-id-setup/machine-id-setup-main.c + src/machine-id-setup/machine-id-setup-main.c \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h systemd_machine_id_setup_LDADD = \ libsystemd-label.la \ @@ -997,14 +1040,14 @@ systemd_machine_id_setup_LDADD = \ # ------------------------------------------------------------------------------ systemd_sysctl_SOURCES = \ - src/sysctl.c + src/sysctl/sysctl.c systemd_sysctl_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_fsck_SOURCES = \ - src/fsck.c + src/fsck/fsck.c systemd_fsck_CFLAGS = \ $(AM_CFLAGS) \ @@ -1012,19 +1055,20 @@ systemd_fsck_CFLAGS = \ systemd_fsck_LDADD = \ libsystemd-shared.la \ + libsystemd-dbus.la \ libudev.la \ $(DBUS_LIBS) # ------------------------------------------------------------------------------ systemd_timestamp_SOURCES = \ - src/timestamp.c + src/timestamp/timestamp.c systemd_timestamp_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ - src/ac-power.c + src/ac-power/ac-power.c systemd_ac_power_LDADD = \ libsystemd-shared.la \ @@ -1032,14 +1076,14 @@ systemd_ac_power_LDADD = \ # ------------------------------------------------------------------------------ systemd_detect_virt_SOURCES = \ - src/detect-virt.c + src/detect-virt/detect-virt.c systemd_detect_virt_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_getty_generator_SOURCES = \ - src/getty-generator.c + src/getty-generator/getty-generator.c systemd_getty_generator_LDADD = \ libsystemd-label.la \ @@ -1047,7 +1091,7 @@ systemd_getty_generator_LDADD = \ # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ - src/rc-local-generator.c + src/rc-local-generator/rc-local-generator.c systemd_rc_local_generator_LDADD = \ libsystemd-label.la \ @@ -1055,14 +1099,16 @@ systemd_rc_local_generator_LDADD = \ # ------------------------------------------------------------------------------ systemd_remount_api_vfs_SOURCES = \ - src/remount-api-vfs.c + src/remount-api-vfs/remount-api-vfs.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h systemd_remount_api_vfs_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgroups_agent_SOURCES = \ - src/cgroups-agent.c + src/cgroups-agent/cgroups-agent.c systemd_cgroups_agent_CFLAGS = \ $(AM_CFLAGS) \ @@ -1070,11 +1116,12 @@ systemd_cgroups_agent_CFLAGS = \ systemd_cgroups_agent_LDADD = \ libsystemd-shared.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) # ------------------------------------------------------------------------------ systemctl_SOURCES = \ - src/systemctl.c + src/systemctl/systemctl.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -1086,11 +1133,13 @@ systemctl_LDADD = \ libsystemd-daemon.la \ libsystemd-journal.la \ libsystemd-id128.la \ + libsystemd-dbus.la \ + libsystemd-logs.la $(DBUS_LIBS) # ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ - src/notify.c \ + src/notify/notify.c \ src/readahead/sd-readahead.c systemd_notify_LDADD = \ @@ -1099,8 +1148,7 @@ systemd_notify_LDADD = \ # ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ - src/ask-password.c \ - src/ask-password-api.c + src/ask-password/ask-password.c systemd_ask_password_LDADD = \ libsystemd-label.la \ @@ -1108,28 +1156,32 @@ systemd_ask_password_LDADD = \ # ------------------------------------------------------------------------------ systemd_reply_password_SOURCES = \ - src/reply-password.c + src/reply-password/reply-password.c systemd_reply_password_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgls_SOURCES = \ - src/cgls.c + src/cgls/cgls.c systemd_cgls_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgtop_SOURCES = \ - src/cgtop.c + src/cgtop/cgtop.c systemd_cgtop_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ - src/nspawn.c + src/nspawn/nspawn.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/loopback-setup.c \ + src/core/loopback-setup.h systemd_nspawn_LDADD = \ libsystemd-label.la \ @@ -1146,8 +1198,7 @@ systemd_stdio_bridge_LDADD = \ # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ - src/tty-ask-password-agent.c \ - src/ask-password-api.c + src/tty-ask-password-agent/tty-ask-password-agent.c systemd_tty_ask_password_agent_LDADD = \ libsystemd-label.la \ @@ -1155,7 +1206,7 @@ systemd_tty_ask_password_agent_LDADD = \ # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ - src/sd-daemon.c + src/libsystemd-daemon/sd-daemon.c libsystemd_daemon_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1166,7 +1217,7 @@ 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 + -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym pkginclude_HEADERS += \ src/systemd/sd-daemon.h @@ -1194,7 +1245,7 @@ lib_LTLIBRARIES += \ libsystemd-daemon.la pkgconfiglib_DATA += \ - src/libsystemd-daemon.pc + src/libsystemd-daemon/libsystemd-daemon.pc MANPAGES += \ man/sd-daemon.7 \ @@ -1217,8 +1268,8 @@ man/sd_is_mq.3: man/sd_is_fifo.3 man/sd_notifyf.3: man/sd_notify.3 EXTRA_DIST += \ - src/libsystemd-daemon.pc.in \ - src/libsystemd-daemon.sym + src/libsystemd-daemon/libsystemd-daemon.pc.in \ + src/libsystemd-daemon/libsystemd-daemon.sym # ------------------------------------------------------------------------------ SUBDIRS += \ @@ -1856,7 +1907,7 @@ udevlibexec_PROGRAMS += \ # ------------------------------------------------------------------------------ libsystemd_id128_la_SOURCES = \ - src/sd-id128.c + src/libsystemd-id128/sd-id128.c libsystemd_id128_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1866,7 +1917,7 @@ 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 + -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ libsystemd-shared.la @@ -1888,7 +1939,7 @@ lib_LTLIBRARIES += \ libsystemd-id128.la pkgconfiglib_DATA += \ - src/libsystemd-id128.pc + src/libsystemd-id128/libsystemd-id128.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-id128-install-hook: @@ -1910,8 +1961,8 @@ UNINSTALL_EXEC_HOOKS += \ libsystemd-id128-uninstall-hook EXTRA_DIST += \ - src/libsystemd-id128.pc.in \ - src/libsystemd-id128.sym + src/libsystemd-id128/libsystemd-id128.pc.in \ + src/libsystemd-id128/libsystemd-id128.sym # ------------------------------------------------------------------------------ systemd_journald_SOURCES = \ @@ -1972,17 +2023,8 @@ journalctl_SOURCES = \ journalctl_LDADD = \ libsystemd-shared.la \ libsystemd-journal.la \ - libsystemd-id128.la - -if HAVE_XZ -journalctl_SOURCES += \ - src/journal/compress.c -journalctl_CFLAGS = \ - $(AM_CFLAGS) \ - $(XZ_CFLAGS) -journalctl_LDADD += \ - $(XZ_LIBS) -endif + libsystemd-id128.la \ + libsystemd-logs.la test_journal_SOURCES = \ src/journal/test-journal.c \ @@ -2273,7 +2315,7 @@ EXTRA_DIST += \ units/quotacheck.service.in systemd_quotacheck_SOURCES = \ - src/quotacheck.c + src/quotacheck/quotacheck.c systemd_quotacheck_LDADD = \ libsystemd-shared.la @@ -2293,7 +2335,7 @@ EXTRA_DIST += \ units/systemd-random-seed-load.service.in systemd_random_seed_SOURCES = \ - src/random-seed.c + src/random-seed/random-seed.c systemd_random_seed_LDADD = \ libsystemd-label.la \ @@ -2326,8 +2368,7 @@ dist_systemunit_DATA += \ units/cryptsetup.target systemd_cryptsetup_SOURCES = \ - src/cryptsetup/cryptsetup.c \ - src/ask-password-api.c + src/cryptsetup/cryptsetup.c systemd_cryptsetup_CFLAGS = \ $(AM_CFLAGS) \ @@ -2360,9 +2401,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_HOSTNAMED systemd_hostnamed_SOURCES = \ - src/hostname/hostnamed.c \ - src/polkit.c \ - src/polkit.h + src/hostname/hostnamed.c systemd_hostnamed_CFLAGS = \ $(AM_CFLAGS) \ @@ -2371,6 +2410,7 @@ systemd_hostnamed_CFLAGS = \ systemd_hostnamed_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) rootlibexec_PROGRAMS += \ @@ -2411,9 +2451,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_LOCALED systemd_localed_SOURCES = \ - src/locale/localed.c \ - src/polkit.c \ - src/polkit.h + src/locale/localed.c systemd_localed_CFLAGS = \ $(AM_CFLAGS) \ @@ -2423,6 +2461,7 @@ systemd_localed_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) nodist_systemunit_DATA += \ @@ -2473,9 +2512,7 @@ endif # ------------------------------------------------------------------------------ if ENABLE_TIMEDATED systemd_timedated_SOURCES = \ - src/timedate/timedated.c \ - src/polkit.c \ - src/polkit.h + src/timedate/timedated.c systemd_timedated_CFLAGS = \ $(AM_CFLAGS) \ @@ -2484,6 +2521,7 @@ systemd_timedated_CFLAGS = \ systemd_timedated_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ $(DBUS_LIBS) rootlibexec_PROGRAMS += \ @@ -2538,10 +2576,6 @@ systemd_logind_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ - src/dbus-loop.c \ - src/dbus-loop.h \ - src/polkit.c \ - src/polkit.h \ src/login/logind-acl.h nodist_systemd_logind_SOURCES = \ @@ -2556,6 +2590,7 @@ systemd_logind_LDADD = \ libsystemd-shared.la \ libsystemd-audit.la \ libsystemd-daemon.la \ + libsystemd-dbus.la \ libudev.la \ $(DBUS_LIBS) @@ -2587,6 +2622,7 @@ loginctl_CFLAGS = \ loginctl_LDADD = \ libsystemd-shared.la \ + libsystemd-dbus.la \ libudev.la \ $(DBUS_LIBS)