X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=21097bf6ba2b53bdde6f40ddfedb35397153f897;hp=2c9c5e30416082b27bb442ec81091e776ad95c8e;hb=d29ae2914e1146f45ff4104faafef5331837bed7;hpb=65eb4378c3e1de25383d8cd606909e64c71edc80 diff --git a/Makefile.am b/Makefile.am index 2c9c5e304..21097bf6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,7 +74,6 @@ dbussessionservicedir=@dbussessionservicedir@ dbussystemservicedir=@dbussystemservicedir@ pamlibdir=@pamlibdir@ pamconfdir=@pamconfdir@ -pkgconfigdatadir=$(datadir)/pkgconfig pkgconfiglibdir=$(libdir)/pkgconfig polkitpolicydir=$(datadir)/polkit-1/actions bashcompletiondir=@bashcompletiondir@ @@ -506,7 +505,8 @@ dist_systemunit_DATA = \ units/systemd-udevd-control.socket \ units/systemd-udevd-kernel.socket \ units/system-update.target \ - units/initrd-switch-root.target + units/initrd-switch-root.target \ + units/machines.target if ENABLE_KDBUS dist_systemunit_DATA += \ @@ -895,7 +895,15 @@ libsystemd_shared_la_SOURCES = \ src/shared/uid-range.h \ src/shared/nss-util.h \ src/shared/btrfs-util.c \ - src/shared/btrfs-util.h + src/shared/btrfs-util.h \ + src/shared/btrfs-ctree.h \ + src/shared/verbs.c \ + src/shared/verbs.h \ + src/shared/machine-image.c \ + src/shared/machine-image.h \ + src/shared/sigbus.c \ + src/shared/sigbus.h \ + src/shared/build.h if HAVE_UTMP libsystemd_shared_la_SOURCES += \ @@ -1044,10 +1052,10 @@ libsystemd_core_la_SOURCES = \ src/core/socket.h \ src/core/busname.c \ src/core/busname.h \ - src/core/bus-common.c \ - src/core/bus-common.h \ src/core/bus-endpoint.c \ src/core/bus-endpoint.h \ + src/core/bus-policy.c \ + src/core/bus-policy.h \ src/core/target.c \ src/core/target.h \ src/core/snapshot.c \ @@ -1138,8 +1146,6 @@ libsystemd_core_la_SOURCES = \ src/core/loopback-setup.c \ src/core/namespace.c \ src/core/namespace.h \ - src/core/build.h \ - src/core/sysfs-show.h \ src/core/killall.h \ src/core/killall.c \ src/core/audit-fd.c \ @@ -1298,7 +1304,7 @@ dist_dbussystemservice_DATA += \ polkitpolicy_in_in_files += \ src/core/org.freedesktop.systemd1.policy.in.in -pkgconfigdata_DATA = \ +pkgconfiglib_DATA += \ src/core/systemd.pc nodist_rpmmacros_DATA = \ @@ -1382,7 +1388,8 @@ tests += \ test-locale-util \ test-execute \ test-copy \ - test-cap-list + test-cap-list \ + test-sigbus EXTRA_DIST += \ test/a.service \ @@ -1576,6 +1583,12 @@ test_copy_SOURCES = \ test_copy_LDADD = \ libsystemd-shared.la +test_sigbus_SOURCES = \ + src/test/test-sigbus.c + +test_sigbus_LDADD = \ + libsystemd-shared.la + test_condition_SOURCES = \ src/test/test-condition.c @@ -1711,8 +1724,8 @@ test_unaligned_SOURCES = \ test_tables_SOURCES = \ src/test/test-tables.c \ src/shared/test-tables.h \ - src/bus-proxyd/bus-policy.c \ - src/bus-proxyd/bus-policy.h \ + src/bus-proxyd/bus-xml-policy.c \ + src/bus-proxyd/bus-xml-policy.h \ src/journal/journald-server.c \ src/journal/journald-server.h @@ -1946,9 +1959,9 @@ test_conf_files_LDADD = \ libsystemd-shared.la test_bus_policy_SOURCES = \ - src/bus-proxyd/test-bus-policy.c \ - src/bus-proxyd/bus-policy.c \ - src/bus-proxyd/bus-policy.h + src/bus-proxyd/test-bus-xml-policy.c \ + src/bus-proxyd/bus-xml-policy.c \ + src/bus-proxyd/bus-xml-policy.h test_bus_policy_LDADD = \ libsystemd-internal.la \ @@ -2596,8 +2609,8 @@ systemd_run_LDADD = \ # ------------------------------------------------------------------------------ systemd_bus_proxyd_SOURCES = \ src/bus-proxyd/bus-proxyd.c \ - src/bus-proxyd/bus-policy.c \ - src/bus-proxyd/bus-policy.h + src/bus-proxyd/bus-xml-policy.c \ + src/bus-proxyd/bus-xml-policy.h systemd_bus_proxyd_LDADD = \ libsystemd-internal.la \ @@ -3053,6 +3066,7 @@ libsystemd_network_la_SOURCES = \ src/systemd/sd-dhcp6-client.h \ src/systemd/sd-dhcp6-lease.h \ src/systemd/sd-pppoe.h \ + src/systemd/sd-lldp.h \ src/libsystemd-network/sd-dhcp-client.c \ src/libsystemd-network/sd-dhcp-server.c \ src/libsystemd-network/dhcp-network.c \ @@ -3077,7 +3091,18 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/dhcp6-network.c \ src/libsystemd-network/dhcp6-option.c \ src/libsystemd-network/dhcp6-lease-internal.h \ - src/libsystemd-network/sd-dhcp6-lease.c + src/libsystemd-network/sd-dhcp6-lease.c \ + src/libsystemd-network/lldp.h \ + src/libsystemd-network/lldp-tlv.h \ + src/libsystemd-network/lldp-tlv.c \ + src/libsystemd-network/lldp-network.h \ + src/libsystemd-network/lldp-network.c \ + src/libsystemd-network/lldp-port.h \ + src/libsystemd-network/lldp-port.c \ + src/libsystemd-network/lldp-internal.h \ + src/libsystemd-network/lldp-internal.c \ + src/libsystemd-network/lldp-util.h \ + src/libsystemd-network/sd-lldp.c libsystemd_network_la_LIBADD = \ libudev-internal.la \ @@ -3156,13 +3181,25 @@ test_dhcp6_client_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_lldp_SOURCES = \ + src/libsystemd-network/lldp.h \ + src/libsystemd-network/lldp-tlv.h \ + src/libsystemd-network/lldp-tlv.c \ + src/libsystemd-network/test-lldp.c + +test_lldp_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + tests += \ test-dhcp-option \ test-dhcp-client \ test-dhcp-server \ test-ipv4ll \ test-icmp6-rs \ - test-dhcp6-client + test-dhcp6-client \ + test-lldp manual_tests += \ test-pppoe @@ -3582,6 +3619,7 @@ udevadm_LDADD = \ libudev-core.la # ------------------------------------------------------------------------------ +if ENABLE_HWDB INSTALL_DIRS += \ $(sysconfdir)/udev/hwdb.d @@ -3630,6 +3668,7 @@ INSTALL_DATA_HOOKS += \ hwdb-remove-hook: -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin +endif # ------------------------------------------------------------------------------ TESTS += \ @@ -3739,7 +3778,8 @@ v4l_id_SOURCES = \ src/udev/v4l_id/v4l_id.c v4l_id_LDADD = \ - libudev-internal.la + libudev-internal.la \ + libsystemd-shared.la udevlibexec_PROGRAMS += \ v4l_id @@ -5009,10 +5049,13 @@ rootlibexec_PROGRAMS += \ systemd-machined libsystemd_machine_core_la_SOURCES = \ - src/machine/machined-dbus.c \ src/machine/machine.c \ src/machine/machine.h \ - src/machine/machine-dbus.c + src/machine/machined-dbus.c \ + src/machine/machine-dbus.c \ + src/machine/machine-dbus.h \ + src/machine/image-dbus.c \ + src/machine/image-dbus.h libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ @@ -5060,6 +5103,12 @@ dist_dbussystemservice_DATA += \ dist_dbuspolicy_DATA += \ src/machine/org.freedesktop.machine1.conf +polkitpolicy_files += \ + src/machine/org.freedesktop.machine1.policy + +polkitpolicy_in_files += \ + src/machine/org.freedesktop.machine1.policy.in + dist_zshcompletion_DATA += \ shell-completion/zsh/_machinectl \ shell-completion/zsh/_sd_machines @@ -5092,6 +5141,34 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la + +if HAVE_LIBCURL + +bin_PROGRAMS += \ + systemd-import + +systemd_import_SOURCES = \ + src/import/import.c \ + src/import/import-gpt.c \ + src/import/import-gpt.h \ + src/import/import-dkr.c \ + src/import/import-dkr.h \ + src/import/curl-util.c \ + src/import/curl-util.h \ + src/import/aufs-util.c \ + src/import/aufs-util.h + +systemd_import_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCURL_CFLAGS) + +systemd_import_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(LIBCURL_LIBS) \ + -lm +endif + endif # ------------------------------------------------------------------------------ @@ -5450,6 +5527,7 @@ rootlibexec_PROGRAMS += \ loginctl_SOURCES = \ src/login/loginctl.c \ + src/login/sysfs-show.h \ src/login/sysfs-show.c loginctl_LDADD = \ @@ -6014,7 +6092,6 @@ EXTRA_DIST += \ CLEANFILES += \ $(nodist_systemunit_DATA) \ $(nodist_userunit_DATA) \ - $(pkgconfigdata_DATA) \ $(pkgconfiglib_DATA) \ $(nodist_polkitpolicy_DATA)