X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=10934eba770765ac1d0f8e1e2193b941b455faf9;hp=163e8f8fee6d9239a7415f61325d54af5d5f4ba5;hb=1e447e0a3cb3e98827938a182593056ddbb13b29;hpb=9d6cbf7871f5ff69e5835caef1b46673af51e000 diff --git a/Makefile.am b/Makefile.am index 163e8f8fe..10934eba7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,6 +109,7 @@ noinst_LTLIBRARIES = lib_LTLIBRARIES = include_HEADERS = pkgconfiglib_DATA = +polkitpolicy_in_in_files = polkitpolicy_in_files = polkitpolicy_files = dist_udevrules_DATA = @@ -266,7 +267,8 @@ rootbin_PROGRAMS = \ systemd-ask-password \ systemd-tty-ask-password-agent \ systemd-tmpfiles \ - systemd-machine-id-setup + systemd-machine-id-setup \ + systemd-analyze bin_PROGRAMS = \ systemd-cgls \ @@ -294,17 +296,18 @@ rootlibexec_PROGRAMS = \ systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ - systemd-system-update-generator \ - systemd-efi-boot-generator + systemd-system-update-generator -dist_bin_SCRIPTS = \ - src/analyze/systemd-analyze +systemd_analyze_SOURCES = \ + src/analyze/systemd-analyze.c -EXTRA_DIST += \ - src/analyze/systemd-analyze.in +systemd_analyze_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) -CLEANFILES += \ - src/analyze/systemd-analyze +systemd_analyze_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la dist_bashcompletion_DATA = \ shell-completion/systemd-bash-completion.sh @@ -573,6 +576,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/fdset.h \ src/shared/strv.c \ src/shared/strv.h \ + src/shared/env-util.c \ + src/shared/env-util.h \ src/shared/strbuf.c \ src/shared/strbuf.h \ src/shared/strxcpyx.c \ @@ -618,6 +623,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/time-dst.h \ src/shared/calendarspec.c \ src/shared/calendarspec.h \ + src/shared/fileio.c \ + src/shared/fileio.h \ src/shared/output-mode.h #------------------------------------------------------------------------------- @@ -670,6 +677,8 @@ libsystemd_label_la_SOURCES = \ src/shared/mkdir.h \ src/shared/ask-password-api.c \ src/shared/ask-password-api.h \ + src/shared/fileio-label.c \ + src/shared/fileio-label.h \ src/shared/dev-setup.c \ src/shared/dev-setup.h @@ -853,7 +862,9 @@ libsystemd_core_la_SOURCES = \ src/core/syscall-list.c \ src/core/syscall-list.h \ src/core/audit-fd.c \ - src/core/audit-fd.h + src/core/audit-fd.h \ + src/core/sync.c \ + src/core/sync.h if HAVE_KMOD libsystemd_core_la_SOURCES += \ @@ -873,7 +884,8 @@ libsystemd_core_la_CFLAGS = \ $(LIBWRAP_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ - $(KMOD_CFLAGS) + $(KMOD_CFLAGS) \ + -pthread libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ @@ -964,7 +976,7 @@ dbusinterface_DATA += \ org.freedesktop.systemd1.Swap.xml \ org.freedesktop.systemd1.Path.xml -polkitpolicy_in_in_files = \ +polkitpolicy_in_in_files += \ src/core/org.freedesktop.systemd1.policy.in.in org.freedesktop.systemd1.%.xml: systemd @@ -996,13 +1008,14 @@ noinst_PROGRAMS += \ test-cgroup \ test-install \ test-watchdog \ - test-log \ - test-efivars + test-log noinst_tests += \ test-job-type \ test-env-replace \ + test-strbuf \ test-strv \ + test-strxcpyx \ test-unit-name \ test-unit-file \ test-util \ @@ -1063,11 +1076,16 @@ test_hostname_SOURCES = \ test_hostname_LDADD = \ libsystemd-core.la +if ENABLE_EFI +noinst_PROGRAMS += \ + test-efivars + test_efivars_SOURCES = \ src/test/test-efivars.c test_efivars_LDADD = \ libsystemd-shared.la +endif test_unit_name_SOURCES = \ src/test/test-unit-name.c @@ -1161,6 +1179,12 @@ test_env_replace_SOURCES = \ test_env_replace_LDADD = \ libsystemd-shared.la +test_strbuf_SOURCES = \ + src/test/test-strbuf.c + +test_strbuf_LDADD = \ + libsystemd-shared.la + test_strv_SOURCES = \ src/test/test-strv.c @@ -1168,6 +1192,12 @@ test_strv_LDADD = \ libsystemd-shared.la \ libsystemd-id128-internal.la +test_strxcpyx_SOURCES = \ + src/test/test-strxcpyx.c + +test_strxcpyx_LDADD = \ + libsystemd-shared.la + test_install_SOURCES = \ src/test/test-install.c @@ -1390,12 +1420,17 @@ systemd_system_update_generator_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ +if ENABLE_EFI +systemgenerator_PROGRAMS += \ + systemd-efi-boot-generator + systemd_efi_boot_generator_SOURCES = \ src/efi-boot-generator/efi-boot-generator.c systemd_efi_boot_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +endif # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ @@ -1715,8 +1750,7 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-net_id.c \ src/udev/udev-builtin-path_id.c \ - src/udev/udev-builtin-usb_id.c \ - src/libsystemd-daemon/sd-daemon.c + src/udev/udev-builtin-usb_id.c libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1726,6 +1760,7 @@ libudev_core_la_CFLAGS = \ libudev_core_la_LIBADD = \ libudev-private.la \ libsystemd-label.la \ + libsystemd-daemon-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2867,6 +2902,7 @@ systemd_hostnamed_CFLAGS = \ $(DBUS_CFLAGS) systemd_hostnamed_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ libsystemd-dbus.la @@ -3003,6 +3039,7 @@ systemd_timedated_CFLAGS = \ $(DBUS_CFLAGS) systemd_timedated_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ libsystemd-dbus.la @@ -3050,7 +3087,6 @@ timedatectl_LDADD = \ bin_PROGRAMS += \ timedatectl - endif polkitpolicy_in_files += \ @@ -3059,6 +3095,24 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-timedated.service.in +# ------------------------------------------------------------------------------ +if ENABLE_EFI +bootctl_SOURCES = \ + src/boot/boot.h \ + src/boot/boot-loader.h \ + src/boot/bootctl.c \ + src/boot/boot-loader.c \ + src/boot/boot-efi.c + +bootctl_LDADD = \ + libsystemd-shared.la \ + libsystemd-id128.la \ + libsystemd-daemon.la + +bin_PROGRAMS += \ + bootctl +endif + # ------------------------------------------------------------------------------ if HAVE_MYHOSTNAME libnss_myhostname_la_SOURCES = \ @@ -3420,10 +3474,6 @@ src/%.policy.in: src/%.policy.in.in Makefile $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ -src/analyze/systemd-analyze: %: %.in Makefile - $(SED_PROCESS) - $(AM_V_GEN)chmod +x $@ - src/%.c: src/%.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) < $< > $@ @@ -3440,9 +3490,11 @@ units/user/%: units/%.m4 Makefile $(AM_V_M4)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ +if ENABLE_POLKIT nodist_polkitpolicy_DATA = \ $(polkitpolicy_files) \ $(polkitpolicy_in_in_files:.policy.in.in=.policy) +endif EXTRA_DIST += \ $(polkitpolicy_in_files) \