X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d13963f71a90bb22cc6ae17f9b226597e569b6dd;hp=b38489b616d2693b5a1d38b17a46c173c35b2ea0;hb=56d35ff9ca31a5daea0a85f05156dac76287f05e;hpb=90ccc3fca7e53a60a9e67b9d5812e1d4a27fc07d diff --git a/Makefile.am b/Makefile.am index b38489b61..d13963f71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,7 +83,6 @@ BUILT_SOURCES = INSTALL_EXEC_HOOKS = UNINSTALL_EXEC_HOOKS = INSTALL_DATA_HOOKS = -DISTCHECK_HOOKS = DISTCLEAN_LOCAL_HOOKS = pkginclude_HEADERS = noinst_LTLIBRARIES = @@ -98,6 +97,8 @@ dist_pkgsysconf_DATA = dist_dbuspolicy_DATA = dbusinterface_DATA = dist_dbussystemservice_DATA = +check_PROGRAMS = +TESTS = AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -130,6 +131,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,10 +207,11 @@ bin_PROGRAMS = \ systemd-cgls \ systemd-cgtop \ systemd-stdio-bridge \ - systemd-nspawn + systemd-nspawn \ + systemd-detect-virt dist_bin_SCRIPTS = \ - src/systemd-analyze + src/analyze/systemd-analyze rootlibexec_PROGRAMS = \ systemd \ @@ -223,27 +226,13 @@ rootlibexec_PROGRAMS = \ systemd-fsck \ systemd-timestamp \ systemd-ac-power \ - systemd-detect-virt \ systemd-sysctl systemgenerator_PROGRAMS = \ systemd-getty-generator -noinst_PROGRAMS = \ - test-engine \ - test-job-type \ - test-ns \ - test-loopback \ - test-hostname \ - test-daemon \ - test-cgroup \ - test-env-replace \ - test-strv \ - test-install \ - test-watchdog - dist_bashcompletion_DATA = \ - src/systemd-bash-completion.sh + bash-completion/systemd-bash-completion.sh dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ @@ -484,6 +473,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 +509,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/linux/auto_dev-ioctl.h \ + src/shared/linux/fanotify.h \ + src/shared/missing.h \ + src/shared/list.h \ + src/shared/macro.h \ + src/shared/def.h \ src/shared/util.c \ src/shared/util.h \ src/shared/virt.c \ @@ -549,10 +542,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 +552,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-util.c \ - src/shared/machine-id-util.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 +594,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 +606,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 +669,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 +743,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,8 +782,8 @@ libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-label.la \ libsystemd-shared.la \ + libsystemd-dbus.la \ libudev.la \ - $(DBUS_LIBS) \ $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ @@ -792,7 +813,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 \ @@ -834,6 +856,24 @@ EXTRA_DIST += \ src/core/systemd.pc.in # ------------------------------------------------------------------------------ +check_PROGRAMS += \ + test-engine \ + test-job-type \ + test-ns \ + test-loopback \ + test-hostname \ + test-daemon \ + test-cgroup \ + test-env-replace \ + test-strv \ + test-install \ + test-watchdog + +TESTS += \ + test-job-type \ + test-env-replace \ + test-strv + test_engine_SOURCES = \ src/test/test-engine.c @@ -843,7 +883,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 +906,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 +960,7 @@ test_watchdog_LDADD = \ # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ - src/initctl.c + src/initctl/initctl.c systemd_initctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -927,11 +969,11 @@ systemd_initctl_CFLAGS = \ systemd_initctl_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) + libsystemd-dbus.la # ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ - src/update-utmp.c + src/update-utmp/update-utmp.c systemd_update_utmp_CFLAGS = \ $(AM_CFLAGS) \ @@ -940,12 +982,12 @@ systemd_update_utmp_CFLAGS = \ systemd_update_utmp_LDADD = \ libsystemd-shared.la \ - $(DBUS_LIBS) \ + libsystemd-dbus.la \ $(AUDIT_LIBS) # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ - src/shutdownd.c + src/shutdownd/shutdownd.c systemd_shutdownd_LDADD = \ libsystemd-label.la \ @@ -959,7 +1001,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 +1012,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 +1024,7 @@ systemd_modules_load_LDADD = \ # ------------------------------------------------------------------------------ systemd_tmpfiles_SOURCES = \ - src/tmpfiles.c + src/tmpfiles/tmpfiles.c systemd_tmpfiles_LDADD = \ libsystemd-label.la \ @@ -988,7 +1032,9 @@ systemd_tmpfiles_LDADD = \ # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ - src/machine-id-setup.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 +1043,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 +1058,19 @@ systemd_fsck_CFLAGS = \ systemd_fsck_LDADD = \ libsystemd-shared.la \ - libudev.la \ - $(DBUS_LIBS) + libsystemd-dbus.la \ + libudev.la # ------------------------------------------------------------------------------ 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 +1078,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 +1093,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 +1101,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 +1118,11 @@ systemd_cgroups_agent_CFLAGS = \ systemd_cgroups_agent_LDADD = \ libsystemd-shared.la \ - $(DBUS_LIBS) + libsystemd-dbus.la # ------------------------------------------------------------------------------ systemctl_SOURCES = \ - src/systemctl.c + src/systemctl/systemctl.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -1086,11 +1134,12 @@ systemctl_LDADD = \ libsystemd-daemon.la \ libsystemd-journal.la \ libsystemd-id128.la \ - $(DBUS_LIBS) + libsystemd-dbus.la \ + libsystemd-logs.la # ------------------------------------------------------------------------------ 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 \ @@ -1139,15 +1191,14 @@ systemd_nspawn_LDADD = \ # ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ - src/bridge.c + src/stdio-bridge/stdio-bridge.c systemd_stdio_bridge_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ 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 += \ @@ -1382,7 +1433,8 @@ libudev_core_la_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/udev/udev-builtin-usb_id.c \ + src/libsystemd-daemon/sd-daemon.c libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1391,7 +1443,6 @@ libudev_core_la_CFLAGS = \ libudev_core_la_LIBADD = \ libudev-private.la \ - libsystemd-daemon.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -1404,10 +1455,10 @@ libudev_core_la_CPPFLAGS = \ if HAVE_ACL libudev_core_la_SOURCES += \ src/udev/udev-builtin-uaccess.c \ - src/login/logind-acl.c + src/login/logind-acl.c \ + src/login/sd-login.c libudev_core_la_LIBADD += \ - libsystemd-login.la \ libsystemd-acl.la endif @@ -1432,11 +1483,11 @@ udevadm_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ -TESTS = \ +TESTS += \ src/udev/test/udev-test.pl \ src/udev/test/rules-test.sh -check_PROGRAMS = \ +check_PROGRAMS += \ test-libudev \ test-udev @@ -1467,7 +1518,8 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean EXTRA_DIST += \ src/udev/test/sys.tar.xz \ - $(TESTS) \ + src/udev/test/udev-test.pl \ + src/udev/test/rules-test.sh \ src/udev/test/rule-syntax-check.py # ------------------------------------------------------------------------------ @@ -1652,7 +1704,7 @@ src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/ud $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ -if ENABLE_INTROSPECTION +if HAVE_INTROSPECTION -include $(INTROSPECTION_MAKEFILE) src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la @@ -1696,7 +1748,7 @@ typelibs_DATA = \ src/udev/gudev/GUdev-1.0.typelib CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif # ENABLE_INTROSPECTION +endif # HAVE_INTROSPECTION # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libgudev-install-move-hook: @@ -1744,6 +1796,9 @@ dist_udevhome_SCRIPTS = \ src/udev/keymap/findkeyboards \ src/udev/keymap/keyboard-force-release.sh +TESTS += \ + src/udev/keymap/check-keymaps.sh + EXTRA_DIST += \ src/udev/keymap/check-keymaps.sh @@ -1754,64 +1809,64 @@ CLEANFILES += \ udevkeymapdir = $(libexecdir)/udev/keymaps dist_udevkeymap_DATA = \ - src/udev/keymap/keymaps/acer \ - src/udev/keymap/keymaps/acer-aspire_5720 \ - src/udev/keymap/keymaps/acer-aspire_8930 \ - src/udev/keymap/keymaps/acer-aspire_5920g \ - src/udev/keymap/keymaps/acer-aspire_6920 \ - src/udev/keymap/keymaps/acer-travelmate_c300 \ - src/udev/keymap/keymaps/asus \ - src/udev/keymap/keymaps/compaq-e_evo \ - src/udev/keymap/keymaps/dell \ - src/udev/keymap/keymaps/dell-latitude-xt2 \ - src/udev/keymap/keymaps/everex-xt5000 \ - src/udev/keymap/keymaps/fujitsu-amilo_li_2732 \ - src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 \ - src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ - src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 \ - src/udev/keymap/keymaps/fujitsu-amilo_si_1520 \ - src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 \ - src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 \ - src/udev/keymap/keymaps/genius-slimstar-320 \ - src/udev/keymap/keymaps/hewlett-packard \ - src/udev/keymap/keymaps/hewlett-packard-2510p_2530p \ - src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook \ - src/udev/keymap/keymaps/hewlett-packard-pavilion \ - src/udev/keymap/keymaps/hewlett-packard-presario-2100 \ - src/udev/keymap/keymaps/hewlett-packard-tablet \ - src/udev/keymap/keymaps/hewlett-packard-tx2 \ - src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ - src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 \ - src/udev/keymap/keymaps/lenovo-3000 \ - src/udev/keymap/keymaps/lenovo-ideapad \ - src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ - src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet \ - src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet \ - src/udev/keymap/keymaps/lg-x110 \ - src/udev/keymap/keymaps/logitech-wave \ - src/udev/keymap/keymaps/logitech-wave-cordless \ - src/udev/keymap/keymaps/logitech-wave-pro-cordless \ - src/udev/keymap/keymaps/maxdata-pro_7000 \ - src/udev/keymap/keymaps/medion-fid2060 \ - src/udev/keymap/keymaps/medionnb-a555 \ - src/udev/keymap/keymaps/micro-star \ - src/udev/keymap/keymaps/module-asus-w3j \ - src/udev/keymap/keymaps/module-ibm \ - src/udev/keymap/keymaps/module-lenovo \ - src/udev/keymap/keymaps/module-sony \ - src/udev/keymap/keymaps/module-sony-old \ - src/udev/keymap/keymaps/module-sony-vgn \ - src/udev/keymap/keymaps/olpc-xo \ - src/udev/keymap/keymaps/onkyo \ - src/udev/keymap/keymaps/oqo-model2 \ - src/udev/keymap/keymaps/samsung-other \ - src/udev/keymap/keymaps/samsung-90x3a \ - src/udev/keymap/keymaps/samsung-sq1us \ - src/udev/keymap/keymaps/samsung-sx20s \ - src/udev/keymap/keymaps/toshiba-satellite_a100 \ - src/udev/keymap/keymaps/toshiba-satellite_a110 \ - src/udev/keymap/keymaps/toshiba-satellite_m30x \ - src/udev/keymap/keymaps/zepto-znote + keymaps/acer \ + keymaps/acer-aspire_5720 \ + keymaps/acer-aspire_8930 \ + keymaps/acer-aspire_5920g \ + keymaps/acer-aspire_6920 \ + keymaps/acer-travelmate_c300 \ + keymaps/asus \ + keymaps/compaq-e_evo \ + keymaps/dell \ + keymaps/dell-latitude-xt2 \ + keymaps/everex-xt5000 \ + keymaps/fujitsu-amilo_li_2732 \ + keymaps/fujitsu-amilo_pa_2548 \ + keymaps/fujitsu-amilo_pro_edition_v3505 \ + keymaps/fujitsu-amilo_pro_v3205 \ + keymaps/fujitsu-amilo_si_1520 \ + keymaps/fujitsu-esprimo_mobile_v5 \ + keymaps/fujitsu-esprimo_mobile_v6 \ + keymaps/genius-slimstar-320 \ + keymaps/hewlett-packard \ + keymaps/hewlett-packard-2510p_2530p \ + keymaps/hewlett-packard-compaq_elitebook \ + keymaps/hewlett-packard-pavilion \ + keymaps/hewlett-packard-presario-2100 \ + keymaps/hewlett-packard-tablet \ + keymaps/hewlett-packard-tx2 \ + keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ + keymaps/inventec-symphony_6.0_7.0 \ + keymaps/lenovo-3000 \ + keymaps/lenovo-ideapad \ + keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ + keymaps/lenovo-thinkpad_x6_tablet \ + keymaps/lenovo-thinkpad_x200_tablet \ + keymaps/lg-x110 \ + keymaps/logitech-wave \ + keymaps/logitech-wave-cordless \ + keymaps/logitech-wave-pro-cordless \ + keymaps/maxdata-pro_7000 \ + keymaps/medion-fid2060 \ + keymaps/medionnb-a555 \ + keymaps/micro-star \ + keymaps/module-asus-w3j \ + keymaps/module-ibm \ + keymaps/module-lenovo \ + keymaps/module-sony \ + keymaps/module-sony-old \ + keymaps/module-sony-vgn \ + keymaps/olpc-xo \ + keymaps/onkyo \ + keymaps/oqo-model2 \ + keymaps/samsung-other \ + keymaps/samsung-90x3a \ + keymaps/samsung-sq1us \ + keymaps/samsung-sx20s \ + keymaps/toshiba-satellite_a100 \ + keymaps/toshiba-satellite_a110 \ + keymaps/toshiba-satellite_m30x \ + keymaps/zepto-znote udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release dist_udevkeymapforcerel_DATA = \ @@ -1833,10 +1888,6 @@ src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ - -keymaps-distcheck-hook: src/udev/keymap/keys.txt - $(top_srcdir)/src/udev/keymap/check-keymaps.sh $(top_srcdir) $^ -DISTCHECK_HOOKS += keymaps-distcheck-hook endif # ------------------------------------------------------------------------------ @@ -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 @@ -1878,7 +1929,10 @@ test_id128_LDADD = \ libsystemd-shared.la \ libsystemd-id128.la -noinst_PROGRAMS += \ +check_PROGRAMS += \ + test-id128 + +TESTS += \ test-id128 pkginclude_HEADERS += \ @@ -1888,7 +1942,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 +1964,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 +2026,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 \ @@ -2066,7 +2111,7 @@ libsystemd-journal-uninstall-hook: UNINSTALL_EXEC_HOOKS += \ libsystemd-journal-uninstall-hook -noinst_PROGRAMS += \ +check_PROGRAMS += \ test-journal \ test-journal-send @@ -2273,7 +2318,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 +2338,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 +2371,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 +2404,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,7 +2413,7 @@ systemd_hostnamed_CFLAGS = \ systemd_hostnamed_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) + libsystemd-dbus.la rootlibexec_PROGRAMS += \ systemd-hostnamed @@ -2411,9 +2453,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,7 +2463,7 @@ systemd_localed_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) + libsystemd-dbus.la nodist_systemunit_DATA += \ units/systemd-localed.service @@ -2473,9 +2513,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,7 +2522,7 @@ systemd_timedated_CFLAGS = \ systemd_timedated_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) + libsystemd-dbus.la rootlibexec_PROGRAMS += \ systemd-timedated @@ -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,8 +2590,8 @@ systemd_logind_LDADD = \ libsystemd-shared.la \ libsystemd-audit.la \ libsystemd-daemon.la \ - libudev.la \ - $(DBUS_LIBS) + libsystemd-dbus.la \ + libudev.la if HAVE_ACL systemd_logind_SOURCES += \ @@ -2587,8 +2621,8 @@ loginctl_CFLAGS = \ loginctl_LDADD = \ libsystemd-shared.la \ - libudev.la \ - $(DBUS_LIBS) + libsystemd-dbus.la \ + libudev.la rootbin_PROGRAMS += \ loginctl @@ -2600,7 +2634,7 @@ test_login_LDADD = \ libsystemd-login.la \ libsystemd-shared.la -noinst_PROGRAMS += \ +check_PROGRAMS += \ test-login libsystemd_login_la_SOURCES = \ @@ -2640,9 +2674,9 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-daemon.la \ libsystemd-audit.la \ + libsystemd-dbus.la \ libsystemd-shared.la \ - $(PAM_LIBS) \ - $(DBUS_LIBS) + $(PAM_LIBS) pamlib_LTLIBRARIES = \ pam_systemd.la @@ -3146,8 +3180,6 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS) install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS) -distcheck-hook: $(DISTCHECK_HOOKS) - distclean-local: $(DISTCLEAN_LOCAL_HOOKS) DISTCHECK_CONFIGURE_FLAGS = \