diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 538 |
1 files changed, 143 insertions, 395 deletions
diff --git a/Makefile.am b/Makefile.am index d6010c5cc2..7603b2c0e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,10 +42,6 @@ LIBUDEV_CURRENT=7 LIBUDEV_REVISION=3 LIBUDEV_AGE=6 -LIBGUDEV_CURRENT=2 -LIBGUDEV_REVISION=0 -LIBGUDEV_AGE=2 - LIBSYSTEMD_CURRENT=7 LIBSYSTEMD_REVISION=0 LIBSYSTEMD_AGE=7 @@ -627,6 +623,7 @@ systemgenerator_PROGRAMS += \ endif EXTRA_DIST += \ + src/systemctl/systemd-sysv-install.SKELETON \ units/rc-local.service.in \ units/halt-local.service.in @@ -721,12 +718,6 @@ man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^) -EXTRA_DIST += \ - man/systemd.index.xml \ - man/index.html \ - man/systemd.directives.xml \ - man/glib-event-glue.c - CLEANFILES += \ man/systemd.index.xml \ man/systemd.directives.xml @@ -742,7 +733,12 @@ EXTRA_DIST += \ $(man_MANS) \ tools/make-man-index.py \ tools/make-directive-index.py \ - tools/xml_helper.py + tools/xml_helper.py \ + man/systemd.index.xml \ + man/index.html \ + man/systemd.directives.xml \ + man/glib-event-glue.c \ + $(NULL) # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -785,6 +781,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/time-util.h \ src/shared/locale-util.c \ src/shared/locale-util.h \ + src/shared/signal-util.c \ + src/shared/signal-util.h \ src/shared/mempool.c \ src/shared/mempool.h \ src/shared/hashmap.c \ @@ -918,7 +916,42 @@ libsystemd_shared_la_SOURCES = \ src/shared/sysctl-util.c \ src/shared/sysctl-util.h \ src/shared/hostname-util.h \ - src/shared/hostname-util.c + src/shared/hostname-util.c \ + src/shared/socket-label.c \ + src/shared/label.c \ + src/shared/label.h \ + src/shared/selinux-util.c \ + src/shared/selinux-util.h \ + src/shared/mkdir-label.c \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h \ + src/shared/switch-root.h \ + src/shared/switch-root.c \ + src/shared/fileio-label.c \ + src/shared/fileio-label.h \ + src/shared/dev-setup.c \ + src/shared/dev-setup.h \ + src/shared/dropin.c \ + src/shared/dropin.h \ + src/shared/condition.c \ + src/shared/condition.h \ + src/shared/generator.h \ + src/shared/generator.c \ + src/shared/btrfs-util.c \ + src/shared/btrfs-util.h \ + src/shared/btrfs-ctree.h \ + src/shared/rm-rf.c \ + src/shared/rm-rf.h \ + src/shared/copy.c \ + src/shared/copy.h \ + src/shared/install.c \ + src/shared/install.h \ + src/shared/install-printf.c \ + src/shared/install-printf.h \ + src/shared/path-lookup.c \ + src/shared/path-lookup.h \ + src/shared/specifier.c \ + src/shared/specifier.h if HAVE_UTMP libsystemd_shared_la_SOURCES += \ @@ -937,74 +970,27 @@ nodist_libsystemd_shared_la_SOURCES = \ libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ + $(SELINUX_CFLAGS) \ $(CAP_CFLAGS) \ $(SECCOMP_CFLAGS) \ -pthread libsystemd_shared_la_LIBADD = \ + $(SELINUX_LIBS) \ $(CAP_LIBS) \ -lm -# ------------------------------------------------------------------------------ -noinst_LTLIBRARIES += \ - libsystemd-units.la - -libsystemd_units_la_SOURCES = \ - src/shared/install.c \ - src/shared/install.h \ - src/shared/install-printf.c \ - src/shared/install-printf.h \ - src/shared/path-lookup.c \ - src/shared/path-lookup.h \ - src/shared/specifier.c \ - src/shared/specifier.h - -# ------------------------------------------------------------------------------ +# ----------------------------------------------------------------------------- noinst_LTLIBRARIES += \ - libsystemd-label.la + libsystemd-machine.la -libsystemd_label_la_SOURCES = \ - src/shared/socket-label.c \ - src/shared/label.c \ - src/shared/label.h \ - src/shared/selinux-util.c \ - src/shared/selinux-util.h \ - src/shared/mkdir-label.c \ - src/shared/ask-password-api.c \ - src/shared/ask-password-api.h \ - src/shared/switch-root.h \ - src/shared/switch-root.c \ - src/shared/fileio-label.c \ - src/shared/fileio-label.h \ - src/shared/dev-setup.c \ - src/shared/dev-setup.h \ - src/shared/dropin.c \ - src/shared/dropin.h \ - src/shared/condition.c \ - src/shared/condition.h \ - src/shared/generator.h \ - src/shared/generator.c \ - src/shared/btrfs-util.c \ - src/shared/btrfs-util.h \ - src/shared/btrfs-ctree.h \ - src/shared/rm-rf.c \ - src/shared/rm-rf.h \ +libsystemd_machine_la_SOURCES = \ src/shared/machine-image.c \ src/shared/machine-image.h \ src/shared/machine-pool.c \ - src/shared/machine-pool.h \ - src/shared/copy.c \ - src/shared/copy.h - -libsystemd_label_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(SELINUX_CFLAGS) - -libsystemd_label_la_LIBADD = \ - $(SELINUX_LIBS) + src/shared/machine-pool.h # ----------------------------------------------------------------------------- - if HAVE_LIBIPTC noinst_LTLIBRARIES += \ libsystemd-fw.la @@ -1022,7 +1008,6 @@ libsystemd_fw_la_LIBADD = \ endif # ----------------------------------------------------------------------------- - if ENABLE_LDCONFIG dist_systemunit_DATA += \ units/ldconfig.service @@ -1215,8 +1200,6 @@ libsystemd_core_la_CFLAGS = \ -pthread libsystemd_core_la_LIBADD = \ - libsystemd-units.la \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-shared.la \ libsystemd-internal.la \ @@ -1451,6 +1434,7 @@ tests += \ test-socket-util \ test-fdset \ test-conf-files \ + test-conf-parser \ test-capability \ test-async \ test-ratelimit \ @@ -1654,7 +1638,6 @@ test_copy_SOURCES = \ src/test/test-copy.c test_copy_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la test_sigbus_SOURCES = \ @@ -1667,9 +1650,8 @@ test_condition_SOURCES = \ src/test/test-condition.c test_condition_LDADD = \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la test_fdset_SOURCES = \ src/test/test-fdset.c @@ -1694,7 +1676,6 @@ test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la test_process_util_SOURCES = \ @@ -1714,8 +1695,6 @@ test_path_lookup_SOURCES = \ test_path_lookup_LDADD = \ -lm \ - libsystemd-units.la \ - libsystemd-label.la \ libsystemd-shared.la test_uid_range_SOURCES = \ @@ -1889,7 +1868,6 @@ test_btrfs_SOURCES = \ src/test/test-btrfs.c test_btrfs_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la if HAVE_LIBIPTC @@ -1965,7 +1943,6 @@ test_cgroup_SOURCES = \ src/test/test-cgroup.c test_cgroup_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la \ libsystemd-internal.la @@ -1987,9 +1964,8 @@ test_cgroup_util_SOURCES = \ src/test/test-cgroup-util.c test_cgroup_util_LDADD = \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la test_env_replace_SOURCES = \ src/test/test-env-replace.c @@ -2007,15 +1983,13 @@ test_strv_SOURCES = \ src/test/test-strv.c test_strv_LDADD = \ - libsystemd-units.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la test_path_util_SOURCES = \ src/test/test-path-util.c test_path_util_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la test_path_SOURCES = \ @@ -2046,8 +2020,6 @@ test_install_SOURCES = \ src/test/test-install.c test_install_LDADD = \ - libsystemd-units.la \ - libsystemd-label.la \ libsystemd-shared.la \ libsystemd-internal.la @@ -2075,7 +2047,12 @@ test_conf_files_SOURCES = \ src/test/test-conf-files.c test_conf_files_LDADD = \ - libsystemd-label.la \ + libsystemd-shared.la + +test_conf_parser_SOURCES = \ + src/test/test-conf-parser.c + +test_conf_parser_LDADD = \ libsystemd-shared.la test_bus_policy_SOURCES = \ @@ -2083,8 +2060,8 @@ test_bus_policy_SOURCES = \ test_bus_policy_LDADD = \ libsystemd-proxy.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la # ------------------------------------------------------------------------------ ## .PHONY so it always rebuilds it @@ -2131,14 +2108,14 @@ systemd_analyze_SOURCES = \ src/analyze/analyze-verify.c \ src/analyze/analyze-verify.h -systemd_verify_CFLAGS = \ +systemd_analyze_CFLAGS = \ $(AM_CFLAGS) \ $(SECCOMP_CFLAGS) systemd_analyze_LDADD = \ libsystemd-core.la \ - libsystemd-internal.la \ libsystemd-shared.la \ + libsystemd-internal.la \ $(RT_LIBS) # ------------------------------------------------------------------------------ @@ -2167,9 +2144,8 @@ systemd_update_done_SOURCES = \ src/update-done/update-done.c systemd_update_done_LDADD = \ - libsystemd-internal.la \ - libsystemd-label.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la # ------------------------------------------------------------------------------ systemd_shutdown_SOURCES = \ @@ -2182,7 +2158,6 @@ systemd_shutdown_SOURCES = \ src/core/killall.c systemd_shutdown_LDADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2228,10 +2203,8 @@ systemd_tmpfiles_SOURCES = \ src/tmpfiles/tmpfiles.c systemd_tmpfiles_LDADD = \ - libsystemd-units.la \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la if HAVE_ACL systemd_tmpfiles_LDADD += \ @@ -2293,10 +2266,8 @@ systemd_sysusers_SOURCES = \ src/sysusers/sysusers.c systemd_sysusers_LDADD = \ - libsystemd-units.la \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la rootbin_PROGRAMS += \ systemd-sysusers @@ -2311,15 +2282,15 @@ nodist_sysusers_DATA = \ sysusers.d/systemd.conf \ sysusers.d/basic.conf +INSTALL_DIRS += \ + $(sysusersdir) +endif + EXTRA_DIST += \ units/systemd-sysusers.service.in \ sysusers.d/systemd.conf.m4 \ sysusers.d/basic.conf.in -INSTALL_DIRS += \ - $(sysusersdir) -endif - # ------------------------------------------------------------------------------ dist_factory_etc_DATA = \ factory/etc/nsswitch.conf @@ -2336,10 +2307,8 @@ systemd_firstboot_SOURCES = \ src/firstboot/firstboot.c systemd_firstboot_LDADD = \ - libsystemd-units.la \ - libsystemd-label.la \ - libsystemd-internal.la \ libsystemd-shared.la \ + libsystemd-internal.la \ -lcrypt rootbin_PROGRAMS += \ @@ -2348,13 +2317,13 @@ rootbin_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-firstboot.service -EXTRA_DIST += \ - units/systemd-firstboot.service.in - SYSINIT_TARGET_WANTS += \ systemd-firstboot.service endif +EXTRA_DIST += \ + units/systemd-firstboot.service.in + # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ src/machine-id-setup/machine-id-setup-main.c \ @@ -2362,9 +2331,8 @@ systemd_machine_id_setup_SOURCES = \ src/core/machine-id-setup.h systemd_machine_id_setup_LDADD = \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la # ------------------------------------------------------------------------------ systemd_sysctl_SOURCES = \ @@ -2385,7 +2353,6 @@ systemd_fsck_SOURCES = \ src/fsck/fsck.c systemd_fsck_LDADD = \ - libsystemd-internal.la \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2397,9 +2364,8 @@ systemd_machine_id_commit_SOURCES = \ src/core/machine-id-setup.h systemd_machine_id_commit_LDADD = \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la SYSINIT_TARGET_WANTS += \ systemd-machine-id-commit.service @@ -2410,8 +2376,8 @@ systemd_ac_power_SOURCES = \ systemd_ac_power_LDADD = \ libudev-internal.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la # ------------------------------------------------------------------------------ systemd_detect_virt_SOURCES = \ @@ -2435,7 +2401,6 @@ systemd_getty_generator_SOURCES = \ src/getty-generator/getty-generator.c systemd_getty_generator_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2443,7 +2408,6 @@ systemd_debug_generator_SOURCES = \ src/debug-generator/debug-generator.c systemd_debug_generator_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2452,7 +2416,6 @@ systemd_fstab_generator_SOURCES = \ src/core/mount-setup.c systemd_fstab_generator_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2460,7 +2423,6 @@ systemd_system_update_generator_SOURCES = \ src/system-update-generator/system-update-generator.c systemd_system_update_generator_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2475,21 +2437,15 @@ systemd_hibernate_resume_SOURCES = \ src/hibernate-resume/hibernate-resume.c systemd_hibernate_resume_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la systemd_hibernate_resume_generator_SOURCES = \ src/hibernate-resume/hibernate-resume-generator.c systemd_hibernate_resume_generator_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la -EXTRA_DIST += \ - units/systemd-hibernate.service.in \ - units/systemd-hibernate-resume@.service.in \ - units/systemd-hybrid-sleep.service.in - dist_systemunit_DATA += \ units/hibernate.target \ units/hybrid-sleep.target @@ -2500,6 +2456,11 @@ nodist_systemunit_DATA += \ units/systemd-hybrid-sleep.service endif +EXTRA_DIST += \ + units/systemd-hibernate.service.in \ + units/systemd-hibernate-resume@.service.in \ + units/systemd-hybrid-sleep.service.in + # ------------------------------------------------------------------------------ if ENABLE_EFI systemgenerator_PROGRAMS += \ @@ -2509,7 +2470,6 @@ systemd_efi_boot_generator_SOURCES = \ src/efi-boot-generator/efi-boot-generator.c systemd_efi_boot_generator_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2527,7 +2487,6 @@ bootctl_CFLAGS = \ $(BLKID_CFLAGS) bootctl_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la \ libsystemd-internal.la \ $(BLKID_LIBS) @@ -2685,7 +2644,6 @@ $(stub): $(stub_solib) # ------------------------------------------------------------------------------ CLEANFILES += test-efi-disk.img -EXTRA_DIST += test/test-efi-create-disk.sh test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh $(AM_V_GEN)test/test-efi-create-disk.sh @@ -2695,6 +2653,8 @@ test-efi: test-efi-disk.img endif endif +EXTRA_DIST += test/test-efi-create-disk.sh + # ------------------------------------------------------------------------------ if HAVE_BLKID systemgenerator_PROGRAMS += \ @@ -2705,7 +2665,6 @@ systemd_gpt_auto_generator_SOURCES = \ src/shared/blkid-util.h systemd_gpt_auto_generator_LDADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-shared.la \ @@ -2725,7 +2684,6 @@ systemd_dbus1_generator_SOURCES = \ src/dbus1-generator/dbus1-generator.c systemd_dbus1_generator_LDADD = \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2750,7 +2708,6 @@ systemd_sysv_generator_SOURCES = \ systemd_sysv_generator_LDADD = \ libsystemd-core.la \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2758,7 +2715,6 @@ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator/rc-local-generator.c systemd_rc_local_generator_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2768,7 +2724,6 @@ systemd_remount_fs_SOURCES = \ src/core/mount-setup.h systemd_remount_fs_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2791,11 +2746,9 @@ systemctl_SOURCES = \ src/systemctl/systemctl.c systemctl_LDADD = \ - libsystemd-units.la \ - libsystemd-label.la \ - libsystemd-internal.la \ libsystemd-logs.la \ libsystemd-journal-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2803,23 +2756,22 @@ systemd_notify_SOURCES = \ src/notify/notify.c systemd_notify_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la # ------------------------------------------------------------------------------ systemd_path_SOURCES = \ src/path/path.c systemd_path_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la # ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ src/ask-password/ask-password.c systemd_ask_password_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2858,9 +2810,9 @@ systemd_nspawn_CFLAGS = \ $(BLKID_CFLAGS) systemd_nspawn_LDADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ + libsystemd-machine.la \ libsystemd-shared.la \ $(BLKID_LIBS) @@ -2880,7 +2832,6 @@ systemd_run_SOURCES = \ src/run/run.c systemd_run_LDADD = \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2956,7 +2907,6 @@ systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent/tty-ask-password-agent.c systemd_tty_ask_password_agent_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -3409,7 +3359,6 @@ libsystemd_network_la_SOURCES = \ libsystemd_network_la_LIBADD = \ libudev-internal.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(KMOD_LIBS) @@ -3432,7 +3381,6 @@ test_dhcp_client_SOURCES = \ test_dhcp_client_LDADD = \ libsystemd-network.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -3451,7 +3399,6 @@ test_ipv4ll_SOURCES = \ test_ipv4ll_LDADD = \ libsystemd-network.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -3657,15 +3604,6 @@ src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIF $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@ # ------------------------------------------------------------------------------ -if ENABLE_GTK_DOC -SUBDIRS += \ - docs/libudev - -noinst_DATA += \ - docs/html/libudev \ - docs/html/gudev -endif - include_HEADERS += \ src/libudev/libudev.h @@ -3705,18 +3643,6 @@ pkgconfiglib_DATA += \ EXTRA_DIST += \ src/libudev/libudev.pc.in -CLEANFILES += \ - docs/html/libudev \ - docs/html/gudev - -docs/html/libudev: - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_LN)$(LN_S) -f ../libudev/html $@ - -docs/html/gudev: - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_LN)$(LN_S) -f ../gudev/html $@ - # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libudev-install-hook: libname=libudev.so && $(move-to-rootlibdir) @@ -3853,7 +3779,6 @@ libudev_core_la_CFLAGS = \ libudev_core_la_LIBADD = \ libudev-internal.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-network.la \ libsystemd-shared.la \ @@ -3940,11 +3865,6 @@ dist_udevhwdb_DATA = \ hwdb/70-pointingstick.hwdb \ hwdb/70-touchpad.hwdb -EXTRA_DIST += \ - units/systemd-hwdb-update.service.in \ - hwdb/ids-update.pl \ - hwdb/sdio.ids - SYSINIT_TARGET_WANTS += \ systemd-hwdb-update.service @@ -3960,6 +3880,11 @@ hwdb-remove-hook: -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin endif +EXTRA_DIST += \ + units/systemd-hwdb-update.service.in \ + hwdb/ids-update.pl \ + hwdb/sdio.ids + # ------------------------------------------------------------------------------ TESTS += \ test/udev-test.pl \ @@ -3985,7 +3910,6 @@ test_libudev_SOURCES = \ src/test/test-libudev.c test_libudev_LDADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -4113,151 +4037,6 @@ dist_udevrules_DATA += \ rules/61-accelerometer.rules # ------------------------------------------------------------------------------ -if ENABLE_GUDEV -if ENABLE_GTK_DOC -SUBDIRS += \ - docs/gudev -endif - -libgudev_includedir = \ - $(includedir)/gudev-1.0/gudev - -libgudev_include_HEADERS = \ - src/gudev/gudev.h \ - src/gudev/gudevenums.h \ - src/gudev/gudevenumtypes.h \ - src/gudev/gudevtypes.h \ - src/gudev/gudevclient.h \ - src/gudev/gudevdevice.h \ - src/gudev/gudevenumerator.h - -lib_LTLIBRARIES += libgudev-1.0.la - -pkgconfiglib_DATA += \ - src/gudev/gudev-1.0.pc - -libgudev_1_0_la_SOURCES = \ - src/gudev/libgudev-1.0.sym \ - src/gudev/gudevenums.h \ - src/gudev/gudevenumtypes.h \ - src/gudev/gudevenumtypes.h\ - src/gudev/gudevtypes.h \ - src/gudev/gudevclient.h \ - src/gudev/gudevclient.c \ - src/gudev/gudevdevice.h \ - src/gudev/gudevdevice.c \ - src/gudev/gudevenumerator.h \ - src/gudev/gudevenumerator.c \ - src/gudev/gudevprivate.h - -nodist_libgudev_1_0_la_SOURCES = \ - src/gudev/gudevmarshal.h \ - src/gudev/gudevmarshal.c \ - src/gudev/gudevenumtypes.h \ - src/gudev/gudevenumtypes.c - -BUILT_SOURCES += \ - $(nodist_libgudev_1_0_la_SOURCES) - -libgudev_1_0_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_builddir)/src\ - -I$(top_srcdir)/src\ - -I$(top_builddir)/src/gudev \ - -I$(top_srcdir)/src/gudev \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ - -D_GUDEV_COMPILATION \ - -DG_LOG_DOMAIN=\"GUdev\" - -libgudev_1_0_la_CFLAGS = \ - $(AM_CFLAGS) \ - -fvisibility=default \ - $(GLIB_CFLAGS) - -libgudev_1_0_la_LIBADD = \ - libudev.la \ - $(GLIB_LIBS) - -libgudev_1_0_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \ - -export-dynamic \ - -no-undefined \ - -Wl,--version-script=$(top_srcdir)/src/gudev/libgudev-1.0.sym - -src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ - -src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)echo '#include "gudevmarshal.h"' > $@ && \ - glib-genmarshal $< --prefix=g_udev_marshal --body >> $@ - -src/gudev/gudevenumtypes.%: src/gudev/gudevenumtypes.%.template src/gudev/gudevenums.h - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)glib-mkenums --template $^ > $@ - -if HAVE_INTROSPECTION --include $(INTROSPECTION_MAKEFILE) - -src/gudev/GUdev-1.0.gir: libgudev-1.0.la - -src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0 - -src_gudev_GUdev_1_0_gir_CFLAGS = \ - $(AM_CFLAGS) \ - $(INCLUDES) \ - -D_GUDEV_COMPILATION \ - -D_GUDEV_WORK_AROUND_DEV_T_BUG \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/src/gudev \ - -I$(top_builddir)/src/gudev - -src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la - -src_gudev_GUdev_1_0_gir_SCANNERFLAGS = \ - --pkg-export=gudev-1.0 \ - --warn-all - -src_gudev_GUdev_1_0_gir_FILES = \ - src/gudev/gudev.h \ - src/gudev/gudevtypes.h \ - src/gudev/gudevenums.h \ - src/gudev/gudevenumtypes.h \ - src/gudev/gudevclient.h \ - src/gudev/gudevdevice.h \ - src/gudev/gudevenumerator.h \ - src/gudev/gudevclient.c \ - src/gudev/gudevdevice.c \ - src/gudev/gudevenumerator.c - -INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir -INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h - -girdir = $(datadir)/gir-1.0 -gir_DATA = \ - src/gudev/GUdev-1.0.gir - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = \ - src/gudev/GUdev-1.0.typelib - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif # HAVE_INTROSPECTION -endif - -EXTRA_DIST += \ - src/gudev/gudev-1.0.pc.in \ - src/gudev/gudevmarshal.list \ - src/gudev/gudevenumtypes.h.template \ - src/gudev/gudevenumtypes.c.template \ - src/gudev/gjs-example.js \ - src/gudev/seed-example-enum.js \ - src/gudev/seed-example.js - -# ------------------------------------------------------------------------------ mtd_probe_SOURCES = \ src/udev/mtd_probe/mtd_probe.c \ src/udev/mtd_probe/mtd_probe.h \ @@ -4289,7 +4068,6 @@ systemd_activate_SOURCES = \ src/activate/activate.c systemd_activate_LDADD = \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -4357,9 +4135,6 @@ dist_systemunit_DATA += \ nodist_systemunit_DATA += \ units/systemd-journal-remote.service -EXTRA_DIST += \ - units/systemd-journal-remote.service.in - journal-remote-install-hook: journal-install-hook -$(MKDIR_P) $(DESTDIR)/var/log/journal/remote -chown 0:0 $(DESTDIR)/var/log/journal/remote @@ -4373,6 +4148,7 @@ nodist_pkgsysconf_DATA += \ src/journal-remote/journal-remote.conf EXTRA_DIST += \ + units/systemd-journal-remote.service.in \ src/journal-remote/journal-remote.conf.in endif @@ -4399,15 +4175,14 @@ systemd_journal_upload_LDADD = \ nodist_systemunit_DATA += \ units/systemd-journal-upload.service -EXTRA_DIST += \ - units/systemd-journal-upload.service.in - nodist_pkgsysconf_DATA += \ src/journal-remote/journal-upload.conf +endif + EXTRA_DIST += \ + units/systemd-journal-upload.service.in \ src/journal-remote/journal-upload.conf.in -endif # using _CFLAGS = in the conditional below would suppress AM_CFLAGS journalctl_CFLAGS = \ @@ -4562,7 +4337,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \ libsystemd_journal_core_la_LIBADD = \ libsystemd-journal-internal.la \ libudev-internal.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -4664,8 +4438,7 @@ gperf_txt_sources += \ libsystemd_journal_internal_la_CFLAGS = \ $(AM_CFLAGS) -libsystemd_journal_internal_la_LIBADD = \ - libsystemd-label.la +libsystemd_journal_internal_la_LIBADD = if HAVE_XZ libsystemd_journal_internal_la_CFLAGS += \ @@ -4814,7 +4587,6 @@ systemd_coredump_SOURCES = \ systemd_coredump_LDADD = \ libsystemd-journal-internal.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -4955,10 +4727,10 @@ dist_pkgsysconf_DATA += \ nodist_systemunit_DATA += \ units/systemd-bootchart.service +endif EXTRA_DIST += \ units/systemd-bootchart.service.in -endif # ------------------------------------------------------------------------------ if ENABLE_QUOTACHECK @@ -4993,7 +4765,6 @@ systemd_random_seed_SOURCES = \ src/random-seed/random-seed.c systemd_random_seed_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la SYSINIT_TARGET_WANTS += \ @@ -5016,7 +4787,6 @@ systemd_backlight_SOURCES = \ src/backlight/backlight.c systemd_backlight_LDADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -5037,7 +4807,6 @@ systemd_rfkill_SOURCES = \ src/rfkill/rfkill.c systemd_rfkill_LDADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -5066,7 +4835,6 @@ systemd_cryptsetup_CFLAGS = \ $(LIBCRYPTSETUP_CFLAGS) systemd_cryptsetup_LDADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-shared.la \ @@ -5076,7 +4844,6 @@ systemd_cryptsetup_generator_SOURCES = \ src/cryptsetup/cryptsetup-generator.c systemd_cryptsetup_generator_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la SYSINIT_TARGET_WANTS += \ @@ -5090,7 +4857,6 @@ systemd_hostnamed_SOURCES = \ src/hostname/hostnamed.c systemd_hostnamed_LDADD = \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -5155,7 +4921,6 @@ systemd_localed_SOURCES = \ src/locale/localed.c systemd_localed_LDADD = \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(XKBCOMMON_LIBS) @@ -5224,7 +4989,6 @@ systemd_timedated_SOURCES = \ src/timedate/timedated.c systemd_timedated_LDADD = \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -5295,7 +5059,6 @@ gperf_gperf_sources += \ systemd_timesyncd_LDADD = \ libsystemd-resolve.la \ libsystemd-network.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -5363,9 +5126,9 @@ libsystemd_machine_core_la_SOURCES = \ src/machine/image-dbus.h libsystemd_machine_core_la_LIBADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ + libsystemd-machine.la \ libsystemd-shared.la noinst_LTLIBRARIES += \ @@ -5378,7 +5141,6 @@ machinectl_LDADD = \ libsystemd-internal.la \ libsystemd-logs.la \ libsystemd-journal-internal.la \ - libsystemd-units.la \ libsystemd-shared.la rootbin_PROGRAMS += \ @@ -5427,9 +5189,6 @@ SYSTEM_UNIT_ALIASES += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.machine1.busname -EXTRA_DIST += \ - units/systemd-machined.service.in - libnss_mymachines_la_SOURCES = \ src/nss-mymachines/nss-mymachines.sym \ src/nss-mymachines/nss-mymachines.c @@ -5452,6 +5211,9 @@ lib_LTLIBRARIES += \ endif +EXTRA_DIST += \ + units/systemd-machined.service.in + # ------------------------------------------------------------------------------ if ENABLE_IMPORTD @@ -5477,8 +5239,8 @@ systemd_importd_CFLAGS = \ -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\" systemd_importd_LDADD = \ + libsystemd-machine.la \ libsystemd-internal.la \ - libsystemd-label.la \ libsystemd-shared.la systemd_pull_SOURCES = \ @@ -5514,7 +5276,7 @@ systemd_pull_CFLAGS = \ -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" systemd_pull_LDADD = \ - libsystemd-label.la \ + libsystemd-machine.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(LIBCURL_LIBS) \ @@ -5542,7 +5304,7 @@ systemd_import_CFLAGS = \ $(ZLIB_CFLAGS) systemd_import_LDADD = \ - libsystemd-label.la \ + libsystemd-machine.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(XZ_LIBS) \ @@ -5566,7 +5328,7 @@ systemd_export_CFLAGS = \ $(ZLIB_CFLAGS) systemd_export_LDADD = \ - libsystemd-label.la \ + libsystemd-machine.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(XZ_LIBS) \ @@ -5579,9 +5341,6 @@ dist_rootlibexec_DATA = \ nodist_systemunit_DATA += \ units/systemd-importd.service -EXTRA_DIST += \ - units/systemd-importd.service.in - dist_systemunit_DATA_busnames += \ units/org.freedesktop.import1.busname @@ -5617,7 +5376,6 @@ test_qcow2_CFLAGS = \ test_qcow2_LDADD = \ libsystemd-internal.la \ - libsystemd-label.la \ libsystemd-shared.la \ $(ZLIB_LIBS) @@ -5629,6 +5387,11 @@ endif endif +EXTRA_DIST += \ + units/systemd-importd.service.in \ + src/resolve/resolved.conf.in + + # ------------------------------------------------------------------------------ if ENABLE_RESOLVED systemd_resolved_SOURCES = \ @@ -5682,7 +5445,6 @@ gperf_txt_sources += \ systemd_resolved_LDADD = \ libsystemd-network.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(LIBIDN_LIBS) @@ -5702,9 +5464,6 @@ dist_dbuspolicy_DATA += \ dist_dbussystemservice_DATA += \ src/resolve/org.freedesktop.resolve1.service -EXTRA_DIST += \ - units/systemd-resolved.service.m4.in - SYSTEM_UNIT_ALIASES += \ systemd-resolved.service dbus-org.freedesktop.resolve1.service @@ -5717,9 +5476,6 @@ GENERAL_ALIASES += \ nodist_pkgsysconf_DATA += \ src/resolve/resolved.conf -EXTRA_DIST += \ - src/resolve/resolved.conf.in - tests += \ test-dns-domain @@ -5730,7 +5486,6 @@ test_dns_domain_SOURCES = \ test_dns_domain_LDADD = \ libsystemd-network.la \ - libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(LIBIDN_LIBS) @@ -5784,6 +5539,9 @@ rootlibexec_PROGRAMS += \ endif +EXTRA_DIST += \ + units/systemd-resolved.service.m4.in + # ------------------------------------------------------------------------------ if ENABLE_NETWORKD rootlibexec_PROGRAMS += \ @@ -5854,7 +5612,6 @@ libsystemd_networkd_core_la_LIBADD = \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-network.la \ - libsystemd-label.la \ libsystemd-shared.la rootlibexec_PROGRAMS += \ @@ -5947,13 +5704,12 @@ BUSNAMES_TARGET_WANTS += \ gperf_gperf_sources += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf +endif EXTRA_DIST += \ units/systemd-networkd.service.m4.in \ units/systemd-networkd-wait-online.service.in -endif - # ------------------------------------------------------------------------------ if ENABLE_LOGIND systemd_logind_SOURCES = \ @@ -5992,7 +5748,6 @@ libsystemd_logind_core_la_SOURCES = \ src/login/logind-acl.h libsystemd_logind_core_la_LIBADD = \ - libsystemd-label.la \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -6178,14 +5933,14 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-user-sessions.service -EXTRA_DIST += \ - units/systemd-user-sessions.service.in - MULTI_USER_TARGET_WANTS += \ systemd-user-sessions.service endif +EXTRA_DIST += \ + units/systemd-user-sessions.service.in + # ------------------------------------------------------------------------------ if HAVE_PYTHON_DEVEL @@ -6347,9 +6102,6 @@ clean-python: # ------------------------------------------------------------------------------ if ENABLE_COMPAT_LIBS -EXTRA_DIST += \ - src/compat-libs/linkwarning.h - libsystemd-%.c: src/compat-libs/libsystemd-%.sym $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/obsolete_lib(\1,$(notdir $(basename $<)));/p' <$< >$@ @@ -6459,6 +6211,7 @@ UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook endif EXTRA_DIST += \ + src/compat-libs/linkwarning.h \ src/compat-libs/libsystemd-journal.pc.in \ src/compat-libs/libsystemd-login.pc.in \ src/compat-libs/libsystemd-id128.pc.in \ @@ -6505,6 +6258,8 @@ substitutions = \ '|DEBUGTTY=$(DEBUGTTY)|' \ '|KILL=$(KILL)|' \ '|KMOD=$(KMOD)|' \ + '|MOUNT_PATH=$(MOUNT_PATH)|' \ + '|UMOUNT_PATH=$(UMOUNT_PATH)|' \ '|MKDIR_P=$(MKDIR_P)|' \ '|QUOTAON=$(QUOTAON)|' \ '|QUOTACHECK=$(QUOTACHECK)|' \ @@ -6605,7 +6360,7 @@ man/custom-entities.ent: configure.ac printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \ > $@ # ' -DISTCLEANFILES += \ +CLEANFILES += \ man/custom-entities.ent XSLTPROC_FLAGS = \ @@ -6803,7 +6558,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ --with-rootprefix=$$dc_install_base \ - --disable-split-usr \ --enable-kdbus \ --enable-compat-libs @@ -6822,9 +6576,12 @@ DISTCHECK_CONFIGURE_FLAGS += \ --with-python endif -if ENABLE_GTK_DOC +if ENABLE_SPLIT_USR +DISTCHECK_CONFIGURE_FLAGS += \ + --enable-split-usr +else DISTCHECK_CONFIGURE_FLAGS += \ - --enable-gtk-doc + --disable-split-usr endif # @@ -6853,11 +6610,6 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS) dist: dist-check-python dist-check-compat-libs -# check "broken" platforms limited toolchains for link breakage before we release -.PHONY: linkcheck -linkcheck: - $(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,-fuse-ld=gold -Wl,--as-needed -Wl,--no-gc-sections' distcheck - .PHONY: hwdb-update hwdb-update: ( cd $(top_srcdir)/hwdb && \ @@ -6883,10 +6635,6 @@ upload: all check dist .PHONY: doc-sync doc-sync: all destdir-sphinx - gtkdoc-rebase --html-dir=docs/libudev/html --online - rsync -rlv --delete docs/libudev/html/ --omit-dir-times $(www_target)/libudev/ - gtkdoc-rebase --html-dir=docs/gudev/html --online - rsync -rlv --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/ rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/ rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/ |